General bug fixes for 2.0 website