Broke out views, prettier UI