UI-673: Rearrange the inputs, pre populate them and add descriptions
Merge branch 'UI-673'