Hack fix for border, create close before titlebar