cleaned up views and UI