Small GUI adjusments #2.