Reorganize html and some sass