Added right click ability to buttons
Fixed buttons