made a bunch of design changes and collage fixes