Improvements to small parts of the app