Added dialog boxes and other stuff