Ravi | Added username display and fixed some issues and other cleanup