fix title bar definition, fix some refs