Improve site code