More positioning and cleanup