Got rid of header in frontend page
conflicts merge