Changed keyboard shortcuts & fixed little bug