Fixed rendering and changed switch key to shift