UI stuff and quitting
merged with master