Bucket cards now sliding, some buttons wired up

Also merged master, had a merge conflict, resolved.