Fixed resources by using bundles. Ready for submission.