changes to layout and clean up of project