fix colors. change layout