Added user menu + fix pagination