Tidied up js / css calls & bundles