Code cleanup; Moved button subs around