some small fixes
some redesign
some redesign