Added more menu features