Tidy up the frontend a bit