Improve facotrial
button fix
more function fixes