fixed styling for individiual order views
fixed merge conflicts and tests
added logic to view for completed orders
Merge pull request #195 from ianderse/jess

all of the Jess