some color tweeks
fix merge error
search views