Changed calc layout inflater to a layout factory, added program data factory