design changes as well as working edit user implementation to stoberry
Merge branch 'master' of https://github.com/a1247418/stoberry