Update template to match the GUI display
Separate iOS and OSX template (again)
Separate iOS and OSX template (finish)
Merge pull request #199 from vlag/master

Last OSX improvements