changed button and editext id names