adds sort by language
changes selected button styling
fixes merge conflict