Fixed conditional for content area buttons and split into separate include file