Added better menu