GUI improvements, added controls for common use cases