continuing to work on main layout