add links to message
clean
fix snapped view