Rewrote a lot of the code

Switch statements instead of lots of nested ifs
Animation used in the tableview when possible
Toying with a 3rd tab for a map