More GUI changes
Fixed GUI issues & optimized onTouch