Fix display issues, color code backgrounds for clarity