Update color scheme and adopt grid layout