Multiple bug fixes for website

#1961
#1962