Fixed page/post template issues