Ux improvement

#52 and #57 implemented