Reorganizing code and removed unnecessary features( edit, add buttons to Master view )