Some cleanup work on the corners view
Cleanup for split divider view