layout fixes for windows