updated spacing
starting to integrate templates