Fixed GUI issues