Add more GUI changes