fix bugs with design