Fixing Controls

Controls are much better now. Introduced visual problems with text
input. Hopefully will be fixed soon.