Updated css/js
Added merge functionality