Layout fixes + cleanup