Refactored Buddy to Contact and tried to redo some GUI elements
Misc Check in