Merge this to fix the js/css issue