updated coloring and fixed scroll bug