merge dev branch

layout fixes
color fixes