Solved some UI issues / Added touch input support