Add js libs and move stuff around