App modernisation and minor refinements
