Titlebar code (Experimental), misc changes