Merge "refactor titlebar code"