Added scratch, moved some shortcuts