Added user section and some cosmetic changes