added no-border keybinding
resolved remaining conflicts