Working Buttons, small Graphics Engine changes