added nicer fields and UI