Fix menu style
Add layout property to entries
Merge pull request #6 from kennym/master

Several minor fixes