Layout fixes + typo