frontend changes to all _layouts with refactoring and refactored naming