Complete rebuild of front-end
Updated tests to go with updated site