layout simplifications, removed all 'fat' ...