Stability improvements - simplified list and menu items