some positioning adjustments

mainly at end