actually finish all the buttons also sidebar tweak