diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyPrivacy.html b/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyPrivacy.html
index e70deaa74423..dcba91c040f6 100644
--- a/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyPrivacy.html
+++ b/profile2/tool/src/java/org/sakaiproject/profile2/tool/pages/MyPrivacy.html
@@ -26,175 +26,236 @@
 <body>
 <wicket:extend>
 	
-	<div id="pageWrapper" class="container-fluid">
-	<div class="row">
-		<div id="fullWidth" class="col-md-12">
-			<div class="mainSectionContentForm">
-				<h3 wicket:id="heading" class="header privacy">[Privacy settings]</h3>
-				<div wicket:id="infoLocked" class="profile_instruction">[can't change]</div>
-				<form wicket:id="form" class="profileForm">
-					<div class="profileContent" id="privacy-settings" wicket:message="summary:accessibility.privacy.overview">
-
-						<!-- profileImage -->
-						<div class="row" wicket:id="profileImageContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="profileImageLabel">
-								[profileImageLabel]
-							</div>
-							<div class="col-xs-6">
-								<label for="imageprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.image"></wicket:message></label>
-								<select wicket:id="profileImage" wicket:message="title:accessibility.privacy.image"></select>
-							</div>
-						</div>
-
-						<!-- basicInfo -->
-						<div class="row" wicket:id="basicInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="basicInfoLabel">[basicInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="basicinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.basic"></wicket:message></label>
-								<select wicket:id="basicInfo" wicket:message="title:accessibility.privacy.basic"></select>
-							</div>
-						</div>
-
-						<!-- contactInfo -->
-						<div class="row" wicket:id="contactInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="contactInfoLabel">[contactInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="contactinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.contact"></wicket:message></label>
-								<select wicket:id="contactInfo" wicket:message="title:accessibility.privacy.contact"></select>
-							</div>
-						</div>
-
-						<!-- staffInfo -->
-						<div class="row" wicket:id="staffInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="staffInfoLabel">[staffInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="staffinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.staff"></wicket:message></label>
-								<select wicket:id="staffInfo" wicket:message="title:accessibility.privacy.staff"></select>
-							</div>
-						</div>
-
-						<!-- studentInfo -->
-						<div class="row" wicket:id="studentInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="studentInfoLabel">[studentInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="studentinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.student"></wicket:message></label>
-								<select wicket:id="studentInfo" wicket:message="title:accessibility.privacy.student"></select>
-							</div>
-						</div>
-
-						<!-- businessInfo -->
-						<div class="row" wicket:id="businessInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="businessInfoLabel">[businessInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="businessinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.business"></wicket:message></label>
-								<select wicket:id="businessInfo" wicket:message="title:accessibility.privacy.business"></select>
-							</div>
-						</div>
-		
-						<!-- socialNetworkingInfo -->
-						<div class="row" wicket:id="socialNetworkingInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="socialNetworkingInfoLabel">[socialNetworkingInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="socialinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.social"></wicket:message></label>
-								<select wicket:id="socialNetworkingInfo" wicket:message="title:accessibility.privacy.social"></select>
-							</div>
-						</div>
-
-						<!-- personalInfo -->
-						<div class="row" wicket:id="personalInfoContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="personalInfoLabel">[personalInfoLabel]</div>
-							<div class="col-xs-6">
-								<label for="personalinfoprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.personal"></wicket:message></label>
-								<select wicket:id="personalInfo" wicket:message="title:accessibility.privacy.personal"></select>
-							</div>
-						</div>
-
-						<!-- showBirthYear -->
-						<div class="row" wicket:id="birthYearContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="birthYearLabel">[birthYearLabel]</div>
-							<div class="col-xs-6">
-								<input wicket:id="birthYear" type="checkbox" />
-								<label for="birthyearprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.birthyear" /></label>
-							</div>
-						</div>
-
-						<!-- myFriends -->
-						<div class="row" wicket:id="myFriendsContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="myFriendsLabel">[myFriendsLabel]</div>
-							<div class="col-xs-6">
-								<label for="friendsprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.friends"></wicket:message></label>
-								<select wicket:id="myFriends" wicket:message="title:accessibility.privacy.friends"></select>
-							</div>
-						</div>
-
-						<!-- myOnlineStatus -->
-						<div class="row" wicket:id="onlineStatusContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="onlineStatusLabel">[onlineStatusLabel]</div>
-							<div class="col-xs-6">
-								<label for="onlinestatusprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.onlinestatus"></wicket:message></label>
-								<select wicket:id="onlineStatus" wicket:message="title:accessibility.privacy.onlinestatus"></select>
-							</div>
-						</div>
-
-						<!-- myStatus -->
-						<div class="row" wicket:id="myStatusContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="myStatusLabel">[myStatusLabel]</div>
-							<div class="col-xs-6">
-								<label for="statusprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.status"></wicket:message></label>
-								<select wicket:id="myStatus" wicket:message="title:accessibility.privacy.status"></select>
-							</div>
-						</div>
-
-						<!-- myPictures -->
-						<div class="row" wicket:id="myPicturesContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="myPicturesLabel">[myPicturesLabel]</div>
-							<div class="col-xs-6">
-								<label for="picturesprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.pictures"></wicket:message></label>
-								<select wicket:id="myPictures" wicket:message="title:accessibility.privacy.pictures"></select>
-							</div>
-						</div>
-
-						<!-- myMessages -->
-						<div class="row" wicket:id="messagesContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="messagesLabel">[messagesLabel]</div>
-							<div class="col-xs-6">
-								<label for="messagesprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.messages"></wicket:message></label>
-								<select wicket:id="messages" wicket:message="title:accessibility.privacy.messages"></select>
-							</div>
-						</div>
-
-						<!-- myKudos -->
-						<div class="row" wicket:id="myKudosContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="myKudosLabel">[myKudosLabel]</div>
-							<div class="col-xs-6">
-								<label for="kudosprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.kudos"></wicket:message></label>
-								<select wicket:id="myKudos" wicket:message="title:accessibility.privacy.kudos"></select>
-							</div>
-						</div>
-
-						<!-- myWall -->
-						<div class="row" wicket:id="myWallContainer">
-							<div class="col-md-2 col-sm-6 col-xs-12" wicket:id="myWallLabel">[myWallLabel]</div>
-							<div class="col-xs-6">
-								<label for="wallprivacyinput" class="help-block"><wicket:message key="accessibility.privacy.wall"></wicket:message></label>
-								<select wicket:id="myWall" wicket:message="title:accessibility.privacy.wall"></select>
-							</div>
-						</div>
-
-					</div>
-
-					<div class="pageFormButtons">
-						<input type="submit" wicket:id="submit" value="Save" />
-					</div>
-
-				</form>
-				
-				<div wicket:id="formFeedback">[formFeedback]</div>
-
-			</div>
-		</div>
-	</div>
-	</div>
+<div id="pageWrapper" class="container-fluid">
+    <div class="row">
+        <div id="fullWidth" class="col-12">
+            <div class="mainSectionContentForm">
+                <h3 wicket:id="heading" class="header privacy">[Privacy settings]</h3>
+                <div wicket:id="infoLocked" class="profile_instruction">[can't change]</div>
+                <form wicket:id="form" class="profileForm">
+                    <div class="profileContent" id="privacy-settings" wicket:message="summary:accessibility.privacy.overview">
+
+                        <!-- profileImage -->
+                        <div class="row" wicket:id="profileImageContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="profileImageLabel">
+                                [profileImageLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="imageprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.image"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="profileImage" wicket:message="title:accessibility.privacy.image"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- basicInfo -->
+                        <div class="row" wicket:id="basicInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="basicInfoLabel">
+                                [basicInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="basicinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.basic"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="basicInfo" wicket:message="title:accessibility.privacy.basic"></select>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!-- contactInfo -->
+                        <div class="row" wicket:id="contactInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="contactInfoLabel">
+                                [contactInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="contactinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.contact"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="contactInfo" wicket:message="title:accessibility.privacy.contact"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- staffInfo -->
+                        <div class="row" wicket:id="staffInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="staffInfoLabel">
+                                [staffInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="staffinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.staff"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="staffInfo" wicket:message="title:accessibility.privacy.staff"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- studentInfo -->
+                        <div class="row" wicket:id="studentInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="studentInfoLabel">
+                                [studentInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="studentinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.student"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="studentInfo" wicket:message="title:accessibility.privacy.student"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- businessInfo -->
+                        <div class="row" wicket:id="businessInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="businessInfoLabel">
+                                [businessInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="businessinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.business"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="businessInfo" wicket:message="title:accessibility.privacy.business"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- socialNetworkingInfo -->
+                        <div class="row" wicket:id="socialNetworkingInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="socialNetworkingInfoLabel">
+                                [socialNetworkingInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="socialinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.social"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="socialNetworkingInfo" wicket:message="title:accessibility.privacy.social"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- personalInfo -->
+                        <div class="row" wicket:id="personalInfoContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="personalInfoLabel">
+                                [personalInfoLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="personalinfoprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.personal"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="personalInfo" wicket:message="title:accessibility.privacy.personal"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- showBirthYear -->
+                        <div class="row" wicket:id="birthYearContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="birthYearLabel">
+                                [birthYearLabel]
+                            </div>
+                            <div class="col-6">
+                                <input wicket:id="birthYear" type="checkbox" />
+                                <label for="birthyearprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.birthyear" /></label>
+                            </div>
+                        </div>
+
+                        <!-- myFriends -->
+                        <div class="row" wicket:id="myFriendsContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="myFriendsLabel">
+                                [myFriendsLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="friendsprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.friends"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="myFriends" wicket:message="title:accessibility.privacy.friends"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- myOnlineStatus -->
+                        <div class="row" wicket:id="onlineStatusContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="onlineStatusLabel">
+                                [onlineStatusLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="onlinestatusprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.onlinestatus"></wicket:message></label>
+								<div class="6">
+									<select wicket:id="onlineStatus" wicket:message="title:accessibility.privacy.onlinestatus"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- myStatus -->
+                        <div class="row" wicket:id="myStatusContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="myStatusLabel">
+                                [myStatusLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="statusprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.status"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="myStatus" wicket:message="title:accessibility.privacy.status"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- myPictures -->
+                        <div class="row" wicket:id="myPicturesContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="myPicturesLabel">
+                                [myPicturesLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="picturesprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.pictures"></wicket:message></label>
+								<div class="col-6">
+									<select wicket:id="myPictures" wicket:message="title:accessibility.privacy.pictures"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- myMessages -->
+                        <div class="row" wicket:id="messagesContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="messagesLabel">
+                                [messagesLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="messagesprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.messages"></wicket:message></label>
+								<div class="col-6">
+                                <select wicket:id="messages" wicket:message="title:accessibility.privacy.messages"></select>
+								</div>
+                            </div>
+                        </div>
+
+                        <!-- myKudos -->
+                        <div class="row" wicket:id="myKudosContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="myKudosLabel">
+                                [myKudosLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="kudosprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.kudos"></wicket:message></label>
+								<div class="col-6">
+                                	<select wicket:id="myKudos" wicket:message="title:accessibility.privacy.kudos"></select>
+								</div>	
+                            </div>
+                        </div>
+
+                        <!-- myWall -->
+                        <div class="row" wicket:id="myWallContainer">
+                            <div class="col-md-2 col-sm-6 col-12" wicket:id="myWallLabel">
+                                [myWallLabel]
+                            </div>
+                            <div class="col-6">
+                                <label for="wallprivacyinput" class="form-label fw-bold"><wicket:message key="accessibility.privacy.wall"></wicket:message></label>
+								<div class="col-6">
+                                	<select wicket:id="myWall" wicket:message="title:accessibility.privacy.wall"></select>
+								</div>	
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="pageFormButtons">
+                        <input type="submit" wicket:id="submit" value="Save" />
+                    </div>
+
+                </form>
+                
+                <div wicket:id="formFeedback">[formFeedback]</div>
+
+            </div>
+        </div>
+    </div>
+</div>
+
 
 	<!--  general MyPrivacy scripting -->
 	<script type="text/javascript">
@@ -207,5 +268,4 @@ <h3 wicket:id="heading" class="header privacy">[Privacy settings]</h3>
 
 </wicket:extend>
 </body>
-</html>
-
+</html>
\ No newline at end of file
