Added figaro
Restructured html layout