Cleaned up assets and js order - just one error left