redesign, bug fixing