Removed some unnecessary divs
Added adherence to predictions