Layout fixes + typo + refactoring + cleanup + small fixes