Some UI changes and new segues
Merge remote-tracking branch 'origin/master'
UI changes