Improve a bit of the frontend