more GUI polishing