ui changes
category unique
Merge branch 'wip' of github.com:dtechdev/darussalam into wip
admin login change