Added Menu

Merging with master, Admin-Menu working.