Added labels, file dialog, refactored