Fixes for sbp and xap97net

I think this is all for xap97net and sbp. I'm going to continue with menu creation.
Can you prepare the new template / theme so I can integrate it with this?