Added pivot view, starting tweaking code