Follow up of PR #4: UI adjustements

Make the two new inputs fields on two columns.
Some code refactoring.