Refactored layout for next iteration

We need to implement the new, update and delete operations