UI improvements, cleanups, move DOM selectors out of repetitive tasks