minor fixes
woriking on design