Made a whole lot of changes and now the site is almost done