Finish users including admin role and layouts
Finish users including admin role and layouts