Move to jade templates