Major Improvements for the design + features