Refactored some code
Added some views
Some styles