Added more options and modified menu