Fixed Dialog Boxes + Bug fixes