Implement basic site switching

Fixed