SO MUCH CLEANUP views and styles