Cleaning and new layout for hr