Notepad 2.1.1

Reverted to 2.0.x draft loading code, to fix bugs with the 2.1.x
implementation. Also reverted some of the recent layout changes that I
wasn't 100% happy with.