redesign, tiny bug fixes