working on refactoring views for better transition between then with the view controller :)
solving merge issues with views