First time login and some cosmetic changes