UI merge

I merged with your branch and fixed <link> problem. There is another menu item: "Users".