Fixed GUI display bugs