Fix some margin issues with Top Panel and Header