Merge pull request #1 from solamiku/UI

Ui
UI MERGE

UI MERGE
Change with UI

Edit with Account Model and adjusted some UI page
Change with UI

just forgot something ...
Merge pull request #2 from zfaustk/UI

Ui