Code cleanup, added UIColor category for consistent colors