Added system menu
Simplified code