diff --git a/build.sh b/build.sh
index ea4f90e..0433d86 100755
--- a/build.sh
+++ b/build.sh
@@ -166,6 +166,44 @@ make_news_header()
 	echo "</table>" >> "$2"
 }
 
+# arguments: site, page side, page, title
+site_button()
+{
+	if [ "$2" = "news" ]
+	then
+		BTN_SEARCHPATH="./sites/$1/news"
+		BTN_NAME="news"
+		BTN_PAGE="index"
+	else
+		BTN_SEARCHPATH="./sites/$1/$2/$3"
+		BTN_NAME="$3"
+		BTN_PAGE="$3"
+	fi
+
+	if [ -f "$BTN_SEARCHPATH/$BTN_NAME.gif" ]
+	then
+		cp "$BTN_SEARCHPATH/$BTN_NAME.gif" "./out/$1/$BTN_NAME.gif"
+		echo "<a href=\"$BTN_PAGE.html\"><img src=\"$BTN_NAME.gif\"></a><br>"
+		return
+	fi
+
+	if [ -f "$BTN_SEARCHPATH/$BTN_NAME.jpg" ]
+	then
+		cp "$BTN_SEARCHPATH/$BTN_NAME.jpg" "./out/$1/$BTN_NAME.jpg"
+		echo "<a href=\"$BTN_PAGE.html\"><img src=\"$BTN_NAME.jpg\"></a><br>"
+		return
+	fi
+
+	if [ -f "$BTN_SEARCHPATH/$BTN_NAME.png" ]
+	then
+		cp "$BTN_SEARCHPATH/$BTN_NAME.png" "./out/$1/$BTN_NAME.png"
+		echo "<a href=\"$BTN_PAGE.html\"><img src=\"$BTN_NAME.png\"></a><br>"
+		return
+	fi
+
+	echo "<a href=\"$BTN_PAGE.html\">&#8226; $4</a><br>"
+}
+
 # arguments: site-name (folder inside ./sites)
 site_process()
 {
@@ -190,7 +228,8 @@ site_process()
 	saferm "$TMP_PAGES_L"
 
 	# before we collect all pages, add a 'News' button:
-	echo "<a href=\"index.html\">&#8226; News</a><br>" >> "$TMP_PAGES_L"
+	site_button "$1" "news" "index" "News" >> "$TMP_PAGES_L"
+	#echo "<a href=\"index.html\">&#8226; News</a><br>" >> "$TMP_PAGES_L"
 
 	# enumerate and list the right-aligned pages
 	if [ -d "./sites/$1/pages_right" ]
@@ -206,7 +245,8 @@ site_process()
 			continue
 		fi
 
-		echo "<a href=\"$ID_NAME.html\">&#8226; $TITLE</a><br>" >> "$TMP_PAGES_R"
+		site_button "$1" "pages_right" "$ID_NAME" "$TITLE" >> "$TMP_PAGES_R"
+		#echo "<a href=\"$ID_NAME.html\">&#8226; $TITLE</a><br>" >> "$TMP_PAGES_R"
 	done
 	fi
 
@@ -224,7 +264,8 @@ site_process()
 			continue
 		fi
 
-		echo "<a href=\"$ID_NAME.html\">&#8226; $TITLE</a><br>" >> "$TMP_PAGES_L"
+		site_button "$1" "pages_left" "$ID_NAME" "$TITLE" >> "$TMP_PAGES_L"
+		#echo "<a href=\"$ID_NAME.html\">&#8226; $TITLE</a><br>" >> "$TMP_PAGES_L"
 	done
 	fi
 
diff --git a/sites/y2kfan.net/news/news.gif b/sites/y2kfan.net/news/news.gif
new file mode 100644
index 0000000..ac56a9d
Binary files /dev/null and b/sites/y2kfan.net/news/news.gif differ
diff --git a/sites/y2kfan.net/pages_left/consoles/consoles.gif b/sites/y2kfan.net/pages_left/consoles/consoles.gif
new file mode 100644
index 0000000..42bc098
Binary files /dev/null and b/sites/y2kfan.net/pages_left/consoles/consoles.gif differ
diff --git a/sites/y2kfan.net/pages_left/fashion/fashion.jpg b/sites/y2kfan.net/pages_left/fashion/fashion.jpg
new file mode 100644
index 0000000..28bb39f
Binary files /dev/null and b/sites/y2kfan.net/pages_left/fashion/fashion.jpg differ
diff --git a/sites/y2kfan.net/pages_left/gadgets/gadgets.png b/sites/y2kfan.net/pages_left/gadgets/gadgets.png
new file mode 100644
index 0000000..19a2a0a
Binary files /dev/null and b/sites/y2kfan.net/pages_left/gadgets/gadgets.png differ