Added important buttons and state