Fixed titlebar and tweaked border layout so positions can be checked with binary