Gen counter restarts properly, moved controls to the top.