Few More Minor Position Changes

I think I'm done now :)