Placement Updates

Moved some controls around.