Added parsing / fillup step to ui