Refs #2135 Few JS fixes for a cleaner UI/UX