Adding theme
Fixing nav
Fixing the table
Checkpoint