Some ux improvements on main page