Continued improvement of structure in the client gui.
Merge branch 'master' of https://github.com/golvmopp/sdmapeg