Refactored site a little bit to eliminate redundant functionality.