recently added layout fixes