Fix sidebar bug, add more buttons