Fix some issues with page admin & preview