Fix settings and remove extra markup