Some GUI and Input tweaking