Minor UI changes and new service station icons