Added activity_display and cleaned up some things