Added users & more styles