Added toolbar and color scheme