Added layout for the table
- added task hierarchy
- refactored controllers