minor changes and layout