Add while-loops
Tweak layout