Fixed Notification List button, removed unused code and cleaned up
formatting.
further cleanup
Additional cleanup and debug output