Remove action button
Added rover and pickup types & Removed unused vars