Fix code style
Merge branch 'master' into solutions
Toggle behaviour of edit button and update the greetings label after done editing