Misc Changes To Default Template