#major refactiring menu