Broke out views, better UI