Added changes for powerline and some shortcuts