Menu working cleaner & with buttons