Remove unused image_layout js
Remove guard concat
Re-arrange assets again