More clean up
Starting work on editFragmentActivity view mode