Added logic to handle the highlights sections and welcome page