Home menu settings + modal bug fix
Merge pull request #780 from solispauwels/master

Home menu settings + modal bug fix