some fixes in design