Fixed colors and added disclosure indicators.