More work on main page layout