Restore order: Assignments, Handlers, Declarations

What happened? It's like... "to hell with everything!"

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Relocate random window barf

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>