Added borders and finalized demo.