bug fixes
some ui re-design