Modified and got menu reworked