Layout change to look more similar to pf9 UI