Tweak one-column breakpoint
Refactor edge cases