set pointer symbol
add mock remove button
refactor