finalized crash party button
1st attemp to merge my branch with dev
fixed more merge conflicts