UI Cleanup, polish.