Fix issues and add content
Merge with menu application