Fixed style issues, edit event bug
Updated tests