Improvement on objop align and spacing