Re-work of UI layout.