Front end quirks fixed