Major clean-up and shortcuts update