Vivek commits. Mostly changes to UI/UX