Fix bugs with front-end

Edit as I have said.