Fixed Button Bugs and Switched Button Images