Design improvement and account editing bug fix

It closes #11