some fixes in design and functionality