[WIP] Layout fixes

@EmmyBN