Frontend fixes

And faces!