initial revision of angular xmbc integrated spa. Requires tidy up