Refactor coloring
Details update
Layout v1