Fixes for JS & CSS issues