Need to fix titlebar