More work on main page