diff --git a/templates/single-projects.php b/templates/single-projects.php
index d2cf810..a6fa294 100644
--- a/templates/single-projects.php
+++ b/templates/single-projects.php
@@ -12,73 +12,24 @@ if ( $is_fse_theme ) {
 $settings       = projects_portfolio_settings();
 $project_id     = get_the_ID();
 $download_count = (int) get_post_meta( $project_id, '_projects_portfolio_download_count', true );
-$github_url     = get_post_meta( $project_id, '_projects_portfolio_github_url', true );
-$version        = 'Unknown';
-$github_data    = projects_portfolio_get_github_data( $github_url );
 
-// Extract specific GitHub data.
-$owner_avatar = $github_data['owner']['avatar_url'] ?? '';
-$owner_name   = $github_data['owner']['login'] ?? '';
-$owner_url    = $github_data['owner']['html_url'] ?? '';
-$last_updated = $github_data['updated_at'] ?? '';
-$language     = $github_data['language'] ?? '';
-$license      = $github_data['license']['name'] ?? 'None';
-
-$owner = projects_portfolio_github_owner( $owner_name );
-
-// Fetch the version number from the GitHub API if the URL is set.
-if ( $github_url ) {
-    // Retrieve the GitHub API token from the plugin settings.
-    $github_token = get_option( 'projects_portfolio_github_api_token', '' );
-
-    // Prepare the API URL.
-    $api_url = str_replace( 'https://github.com/', 'https://api.github.com/repos/', rtrim( $github_url, '/' ) ) . '/releases/latest';
-
-    // Check if the response is cached.
-    $transient_key = 'github_api_response_' . md5( $api_url );
-    $response      = get_transient( $transient_key );
-
-    if ( false === $response ) {
-        // Prepare the request arguments.
-        $args = [];
-        if ( ! empty( $github_token ) ) {
-            $args['headers'] = [
-                'Authorization' => 'token ' . $github_token,
-            ];
-        }
-
-        // Make the API request.
-        $response = wp_remote_get( $api_url, $args );
-
-        // Cache the response for 1 hour if the request is successful.
-        if ( ! is_wp_error( $response ) && 200 === wp_remote_retrieve_response_code( $response ) ) {
-            set_transient( $transient_key, $response, HOUR_IN_SECONDS );
-        }
-    }
-
-    // Handle the response.
-    if ( is_wp_error( $response ) ) {
-        error_log( 'GitHub API error: ' . $response->get_error_message() );
-    } else {
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
-        error_log( 'GitHub API response code: ' . $response_code );
-        error_log( 'GitHub API response body: ' . $response_body );
-
-        if ( $response_code === 200 ) {
-            $data = json_decode( $response_body, true );
-
-            // Check if tag_name exists in the response.
-            if ( isset( $data['tag_name'] ) ) {
-                $version = esc_html( $data['tag_name'] );
-            }
-        } else {
-            error_log( "GitHub API error: HTTP $response_code for URL $api_url" );
-        }
-    }
+$repo_url = get_post_meta( $project_id, '_projects_portfolio_repo_url', true );
+if ( '' === $repo_url ) {
+    $repo_url = get_post_meta( $project_id, '_projects_portfolio_github_url', true );
 }
 
-// Format last updated date.
+$repo_data = projects_portfolio_get_repo_data( $project_id );
+$version   = projects_portfolio_get_version( $project_id );
+$owner     = projects_portfolio_get_owner( $project_id );
+
+$owner_avatar = $repo_data['owner']['avatar_url'] ?? '';
+$owner_name   = $repo_data['owner']['login']      ?? '';
+$owner_url    = $repo_data['owner']['html_url']    ?? '';
+$last_updated = $repo_data['updated_at']           ?? '';
+$language     = $repo_data['language']             ?? '';
+$license      = $repo_data['license']['name']      ?? 'None';
+$browse_url   = $repo_url ? projects_portfolio_get_repo_browse_url( $project_id ) : '';
+
 if ( $last_updated ) {
     $last_updated = date_i18n( get_option( 'date_format' ), strtotime( $last_updated ) );
 }
@@ -117,12 +68,12 @@ if ( $last_updated ) {
                 <a href="<?php echo esc_url( site_url( '/download/' . $project_id ) ); ?>" class="button project-download-button">
                     <?php esc_html_e( 'Download Now', 'projects-wp' ); ?>
                 </a>
-                <?php if ( $github_url ) : ?>
-                    <a href="<?php echo esc_url( $github_url ); ?>" class="button project-github-button" target="_blank" rel="noopener noreferrer">
-                        <?php esc_html_e( 'View on GitHub', 'projects-wp' ); ?>
+                <?php if ( $repo_url ) : ?>
+                    <a href="<?php echo esc_url( $browse_url ); ?>" class="button project-github-button" target="_blank" rel="noopener noreferrer">
+                        <?php esc_html_e( 'View Repo', 'projects-wp' ); ?>
                     </a>
                 <?php else : ?>
-                    <p><?php esc_html_e( 'GitHub Repository:', 'projects-wp' ); ?> <?php esc_html_e( 'No repository linked.', 'projects-wp' ); ?></p>
+                    <p><?php esc_html_e( 'Repository:', 'projects-wp' ); ?> <?php esc_html_e( 'No repository linked.', 'projects-wp' ); ?></p>
                 <?php endif; ?>
             </div>
 
@@ -163,23 +114,23 @@ if ( $last_updated ) {
                         </tr>
                         <?php endif; ?>
                         <?php
-                        if ( ! empty( $github_data ) ) :
-                            if ( isset( $github_data['stargazers_count'] ) && $settings['templates']['stargazers_count'] ) : ?>
+                        if ( ! empty( $repo_data ) ) :
+                            if ( isset( $repo_data['stargazers_count'] ) && $settings['templates']['stargazers_count'] ) : ?>
                                 <tr>
                                     <th><?php esc_html_e( 'Stars:', 'projects-wp' ); ?></th>
-                                    <td><?php esc_html_e( $github_data['stargazers_count'] ); ?></td>
+                                    <td><?php esc_html_e( $repo_data['stargazers_count'] ); ?></td>
                                 </tr>
                             <?php endif;
-                            if ( isset( $github_data['forks_count'] ) && $settings['templates']['forks'] ) : ?>
+                            if ( isset( $repo_data['forks_count'] ) && $settings['templates']['forks'] ) : ?>
                                 <tr>
                                     <th><?php esc_html_e( 'Forks:', 'projects-wp' ); ?></th>
-                                    <td><?php esc_html_e( $github_data['forks_count'] ); ?></td>
+                                    <td><?php esc_html_e( $repo_data['forks_count'] ); ?></td>
                                 </tr>
                             <?php endif;
-                            if ( isset( $github_data['open_issues_count'] ) && $settings['templates']['open_issues_count'] ) : ?>
+                            if ( isset( $repo_data['open_issues_count'] ) && $settings['templates']['open_issues_count'] ) : ?>
                                 <tr>
                                     <th><?php esc_html_e( 'Issues:', 'projects-wp' ); ?></th>
-                                    <td><?php esc_html_e( $github_data['open_issues_count'] ); ?></td>
+                                    <td><?php esc_html_e( $repo_data['open_issues_count'] ); ?></td>
                                 </tr>
                             <?php endif;
                         endif;
@@ -189,7 +140,7 @@ if ( $last_updated ) {
             </div>
 
             <?php if ( $settings['templates']['github_owner'] && $owner_avatar && $owner_name ) : ?>
-                <a href="<?php esc_html_e( $github_url ); ?>">
+                <a href="<?php echo esc_url( $browse_url ); ?>">
                 <div class="project-owner">
                     <span>
                         <img src="<?php echo esc_url( $owner_avatar ); ?>" alt="<?php esc_attr_e( $owner_name ); ?>" class="owner-avatar" style="width: 50px; height: 50px; border-radius: 50%;" />