upgrading garnet and adding some basic layout stuff