Added Menu Funcitonality and minor changes