Work on refactoring form elements
Work on display data function some more