Bug fixes
Playing around with Django Templates