changed layout
general tidy-up