Cleaned. Renamed. Fixed 'back' segue bugs