Some changes to GUI