Design changes and re-linked angular calls.

The images included here are for testing, I'll remove them once I fix a small bug and (probably) base64 encode the winner.  Everything else is working after the conflict reolution.