Last fixes to the app