Heath's first push
Added Heath's Display changes
Added poorly placed price window
rebased to add Heath