Some changes in GUI