Copied over mainsite tweaks from taylor