Added some sensitive management to buttons