Made the UI slightly less horrible