these are all the things from abdullah merged with my own changes in the physical design of the site