[WIP] Fix some minor layout stuff