Changed the persistence and fixed the grid
Added new functionalities