removed border from last element
fixed onClick handlers, templates, some small styling