Reorder functions for app delegate
Reorganized main window to interface group/minor interface changes