Fix small design bugs