Fix resize problem; more fooling around with toolbar