Add colors and reorganize layout