Fixed the dashboard UI
Merge branch 'feature-admin-ui' into develop