GUI improvements, fixed #65, fixed #66