Commiting first layout refactor