redesign, couple of fixes