Improved site and shell functionality