Removed namespace (causing issues in Eclipse)
JavaScript loading optimisation
Code tidy and removed unused PHP lines