Updated templates & style for 77a46cf