tool box position to right, minor bug fixes