Minor design changes and setting enabeled/disabeled per default.