Best Practices for setting up a server rack

I am in the process of redesigning my server room. Previously, UPSs have been installed into the same rack as the servers. However, I am thinking that perhaps its better to have a rack solely for UPS’s and distribute the power using PDU’s. Also, I was thinking about having the server rack contain its own Gigabit switch and then uplink with fiber to the rack where the client switches are.

Are these good practices? What have you done when setting up your server racks?