Started refactoring title bar