add option to show spaces and some shortcuts improvement