More UI changes, put script/style blocks back in original places