layout and organization fixes