Fixing some color and big screen bugs