Dialog changes & more