I'm bored!!!!

1. better anim on swap contact to remove
2. restore space for edittext in encrypt
3. small clean up