Menu system + improved logic