Added lens view and cleaned up code base