Modified some stuff to makes Sidebar working with Button, improved some other things