Shapes improvements, better transitions