Design improvements
Design changes according to issues