Added proper size and color logic