Redesigned button bar part 2...