rearaned setter
added keybinding
changed layout