Fix GUI issues