Restructured menu for all type of users and fixed bug when user not
found in database