Renamed and made a few layout and color changes