Some more work on fragments, menus etc
Merge remote-tracking branch 'origin/master'