Merge conflicts during rebase from upstream
Fix error during testing after rebase from upstream.
Change bootstrap theme to united
Enhance UX a little on the admin dashboard
Fix error after merging conflictss