Rearranged order of input fields and added a icons

Created test view