Work in progress
Added close button and logo to titlebar