Change Markup

Indent markup properly, add bootstrap tooltip and adjust
spacing between inline inputs with CSS.