Revise Hero layouts into one layout