GUI improvements. Minor bugFix.