Added better buttons