Changed Button layouts and names