fix some positioning issues