Started refactoring
Started working on main layout