Some minor positioning changes