more intuitive menu, bugifxes