Fixed views and cleaned up interface