More layout updates to fix components on screen rotation