Feature/fix home quotes

This pull request fixes the homepage quotes error.

Sorry for the mess, had some merged in changes that sneaked into this one.