Implemented the wrapper screens (repeat, sequence, if) more elegantly