reorganize html layout to make more sense