finished and button normal fix
added new features