Refactor. Prepare for resize handles