OZP-672 - launchmenu updates
OZP-509 - changes from code review