Updated stuff in lift-template