added header elements and created few bugs