Changes from meeting.
Known bug: Location button doesn't work