Polished the main UI