Added two ui components and switched colors back