Rename some files; more demo work
Sort out demo widget resize stuff