Cleaning up the frontend a bit