fixing the first item offset
doing better naming for templates and partials