Some formatting and template fix