removed most of Joes changes as it messed up a few items on the home page