Some fixes added, new menu style