Fix: move html code in template
SPEED-1 Fix: reorder install process