Added better icons, modal support.