Cleanup UX a bit for fun