Added in new shared views. Refactored some code.