issue #97 removed hardcoded value
#124 buttons for map and/or text in right order
Merge pull request #169 from MartijnHeuff/master

issue #97 and #124