further work to main page UI