some design and functionality updates