Stability improvements - simplified list and menu items
Merge pull request #11 from jinxo13/minor_fixes

Stability improvements - simplified list and menu items