Make layers button text, move it under zoom button (closes #181)
Merge remote-tracking branch 'origin/master'