fixing columns behavior, still has issues