[UTILITY] Minor main panel improvements