Fixed GUI behavior