Added menu popup and a simpler button, and a lot of tweaks and stuff