Fixed error when going from contact menu back to the insecurity menu.
Cleaned up the activities for easier read.