Layout revision
Restore html/scss