Several GUI improvements