updates to setup layout