Pulled in designs and final usability tweaks
Merge pull request #43 from great-horned-owls-2014/new_changes

Pulled in designs and final usability tweaks