Fixed menues + added touch support