cleaned up app views and setup