Added some validation and a history view controller