collision fixes & menu fixes