Tidy up frame button
Added catch marker calculation