design fexes
merge