Refactored Menu and Fixed Tutorial

* Tutorial now should be working properly
* Refactored a lot of duplicate code

@ckhamash @adao1123