Minor UI changes and first launch behaviour fixes