templates: use span elements instead of left floating div

<span> have a more natural (inline) flow, i.e. they already have proper spacing
between the elements without additional styling.

On files browser page, since the form element does not flow inline, it needs to
include every element that should be in the first line.