2nd Pass at Adding Button Handling / Grid of Image Buttons