Cleaned up {% load %} statements, updated manifest