Cleaned up UI layout