removed a couple of views and moved that functionality to the view factory + testing