fixed order by button show and merged visual changes