Misc changes on the app