add left/right sidepane
merged master