Fixed: window size and border adjustements