Some quick updates to the layout