Second Commit

Fixed Buttons