Cleaned up www-template