ui refactoring
Replace simple uses of Iterator with a corresponding for-loop. Also add
missing braces on loops as necessary.

Change-Id: I8a453ebf5a7f3328686c39025cee96492ba5e5c3
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>