Start replacing duplicate UI slot code