Tinkered with some opacity issues