Tiny changes for TitleBar, to be designed.