Design 1.2

Moved events to top, next 2 lines are 2/3 and 1/3