Small bugs fix and button is removed