Removed the rougher edges of the site. More work left to do though