Menu updated

MEnu updated to MVC pattern