Still text formatting

icons too
Framework changes before updating template