Work on server side interface with states, textfeilds and fonts
Merge origin/master