Move data from views to controllers
Added some styles
Added some styles