Settings Menu & bugs fix