rework layout and colors