Fixed scrollbar color and reorganized the code