Various layout simplifications and fixes