UI changes, handling flag changes better