Move some small views to the app file where they are used