positioning changes. ready for master