Fixed input field ordering (#46)

See issue #46 
* Added the 3rd column
* Changed the order of the fields