Improve main page UI