[CORE-105] Clean up
[CORE-106] Starting
[CORE-106] JS
[CORE-106] JS
[CORE-106] JS, pt 2
[CORE-106] Updating js + layout