cleanup and standardized UI elements