Graphics updated and buttons improved