Sass file included was missing in last commit
Fixed some files conflits & MAIN MENU structure added