Fixed Bugs in menu @Rameos