More work on MainPage console