Fix add behavior, some styling fixes