[grp discuss] modified ui, fixed bugs, clean code