Goals section plus remove theme