Got rid of the second tab. Changes sorting, added button group