Implementation using div wrapper. Seems to work better