Made some visual changes as per clients requests