fix hr layout
merge conflicts