Minimal changes in GUI