fixed sa portal bugs and started migration from demo to pre-prototype