Bug Fixes

- Fixed selected contact not get highlighted
- Moved a few things around to make the code easier to read