Post-merge css/js polish