Created a common view controller
Check in latest clean up of the controllers