fix content-row issue and refactor.