add colorpicker and fix currentView logic
merged