Cleaning code
Added Menu Class