Small fixes regarding front-end