began reorganizing layout and such