Merged Nikki's fixes for window and button sizes