REPORTS-195: Cleaned up form controller and jsp