Some changes regarding buttons