Refactor
add libs
Update fragment