Updated and cleaned up
Site update