some styling changes, bug fixes and easy edit integration