diff --git a/css/default.css b/css/default.css
index fc06cf4bcf..706f548151 100644
--- a/css/default.css
+++ b/css/default.css
@@ -476,7 +476,6 @@ div.form-container .display-value {
 	float: left;
 	padding: .25em;
 	margin: 0em .5em;
-	z-index: 9999;
 }
 div.form-container .radio input,
 div.form-container .checkbox input,
diff --git a/manage_proj_cat_edit_page.php b/manage_proj_cat_edit_page.php
index 2ecb9a4e1c..0a6d75d461 100644
--- a/manage_proj_cat_edit_page.php
+++ b/manage_proj_cat_edit_page.php
@@ -64,62 +64,44 @@
 
 html_page_top();
 
-print_manage_menu( 'manage_proj_cat_edit_page.php' );
-?>
+print_manage_menu( 'manage_proj_cat_edit_page.php' ); ?>
 
-<br />
-<div>
-<form method="post" action="manage_proj_cat_update.php">
-<?php echo form_security_field( 'manage_proj_cat_update' ) ?>
-<input type="hidden" name="project_id" value="<?php echo $f_project_id ?>"/>
-<table class="width50" cellspacing="1">
-<tr>
-	<td class="form-title" colspan="2">
-		<?php echo lang_get( 'edit_project_category_title' ) ?>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<input type="hidden" name="category_id" value="<?php echo string_attribute( $f_category_id ) ?>" />
-		<?php echo lang_get( 'category' ) ?>
-	</td>
-	<td>
-		<input type="text" name="name" size="32" maxlength="128" value="<?php echo string_attribute( $t_name ) ?>" />
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'assigned_to' ) ?>
-	</th>
-	<td>
-		<select name="assigned_to">
-			<option value="0"></option>
-			<?php print_assign_to_option_list( $t_assigned_to, $t_project_id ) ?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>
-		&#160;
-	</td>
-	<td>
-		<input type="submit" class="button" value="<?php echo lang_get( 'update_category_button' ) ?>" />
-	</td>
-</tr>
-</table>
-</form>
+<div id="manage-proj-category-update-div" class="form-container">
+	<form id="manage-proj-category-update-form" method="post" action="manage_proj_cat_update.php">
+		<fieldset>
+			<legend><span><?php echo lang_get( 'edit_project_category_title' ) ?></span></legend>
+			<?php echo form_security_field( 'manage_proj_cat_update' ) ?>
+			<input type="hidden" name="project_id" value="<?php echo $f_project_id ?>"/>
+			<input type="hidden" name="category_id" value="<?php echo string_attribute( $f_category_id ) ?>" />
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-category-name"><span><?php echo lang_get( 'category' ) ?></span></label>
+				<span class="input"><input type="text" id="proj-category-name" name="name" size="32" maxlength="128" value="<?php echo string_attribute( $t_name ) ?>" /></span>
+				<span class="label-style"></span>
+			</div>
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-category-assigned-to"><span><?php echo lang_get( 'assigned_to' ) ?></span></label>
+				<span class="select">
+					<select id="proj-category-assigned-to" name="assigned_to">
+						<option value="0"></option>
+						<?php print_assign_to_option_list( $t_assigned_to, $t_project_id ) ?>
+					</select>
+				</span>
+				<span class="label-style"></span>
+			</div>
+			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'update_category_button' ) ?>" /></span>
+		</fieldset>
+	</form>
 </div>
 
-<br />
-
-<div class="border center">
-	<form method="post" action="manage_proj_cat_delete.php">
-		<?php echo form_security_field( 'manage_proj_cat_delete' ) ?>
-		<input type="hidden" name="id" value="<?php echo string_attribute( $f_category_id ) ?>" />
-		<input type="hidden" name="project_id" value="<?php echo string_attribute( $f_project_id ) ?>" />
-		<input type="submit" class="button" value="<?php echo lang_get( 'delete_category_button' ) ?>" />
+<div class="form-container">
+	<form method="post" action="manage_proj_cat_delete.php" class="action-button">
+		<fieldset>
+			<?php echo form_security_field( 'manage_proj_cat_delete' ) ?>
+			<input type="hidden" name="id" value="<?php echo string_attribute( $f_category_id ) ?>" />
+			<input type="hidden" name="project_id" value="<?php echo string_attribute( $f_project_id ) ?>" />
+			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'delete_category_button' ) ?>" /></span>
+		</fieldset>
 	</form>
-</div>
+</div><?php
 
-<?php
 html_page_bottom();
diff --git a/manage_proj_ver_edit_page.php b/manage_proj_ver_edit_page.php
index a17b11f01e..44a4a9d2e9 100644
--- a/manage_proj_ver_edit_page.php
+++ b/manage_proj_ver_edit_page.php
@@ -67,79 +67,53 @@
 
 html_page_top();
 
-print_manage_menu( 'manage_proj_ver_edit_page.php' );
-?>
-<br />
-<div>
-<form method="post" action="manage_proj_ver_update.php">
-<?php echo form_security_field( 'manage_proj_ver_update' ) ?>
-<input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" />
-<table class="width50" cellspacing="1">
-<tr>
-	<td class="form-title" colspan="2">
-		<?php echo lang_get( 'edit_project_version_title' ) ?>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'version' ) ?>
-	</th>
-	<td>
-		<input type="text" name="new_version" size="32" maxlength="64" value="<?php echo string_attribute( $t_version->version ) ?>" />
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'date_order' ) ?>
-	</th>
-	<td>
-		<input type="text" id="date_order" name="date_order" class="datetime" size="32" value="<?php echo (date_is_null( $t_version->date_order ) ? '' : string_attribute( date( config_get( 'calendar_date_format' ), $t_version->date_order ) ) ) ?>" />
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'description' ) ?>
-	</th>
-	<td>
-		<textarea name="description" cols="60" rows="5"><?php echo string_attribute( $t_version->description ) ?></textarea>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'released' ) ?>
-	</th>
-	<td>
-		<input type="checkbox" name="released" <?php check_checked( $t_version->released, VERSION_RELEASED ); ?> />
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<th class="category">
-		<?php echo lang_get( 'obsolete' ) ?>
-	</th>
-	<td>
-		<input type="checkbox" name="obsolete" <?php check_checked( $t_version->obsolete, true ); ?> />
-	</td>
-</tr>
-<?php event_signal( 'EVENT_MANAGE_VERSION_UPDATE_FORM', array( $t_version->id ) ); ?>
-<tr>
-	<td>
-		&#160;
-	</td>
-	<td>
-		<input type="submit" class="button" value="<?php echo lang_get( 'update_version_button' ) ?>" />
-	</td>
-</tr>
-</table>
-</form>
-</div>
+print_manage_menu( 'manage_proj_ver_edit_page.php' ); ?>
 
-<br />
+<div id="manage-proj-version-update-div" class="form-container">
+	<form id="manage-proj-version-update-form" method="post" action="manage_proj_ver_update.php">
+		<fieldset>
+			<legend><span><?php echo lang_get( 'edit_project_version_title' ) ?></span></legend>
+			<?php echo form_security_field( 'manage_proj_ver_update' ) ?>
+			<input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" />
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-version-new-version"><span><?php echo lang_get( 'version' ) ?></span></label>
+				<span class="input"><input type="text" id="proj-version-new-version" name="new_version" size="32" maxlength="64" value="<?php echo string_attribute( $t_version->version ) ?>" /></span>
+				<span class="label-style"></span>
+			</div>
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-version-date-order"><span><?php echo lang_get( 'date_order' ) ?></span></label>
+				<span class="input"><input type="text" id="proj-version-date-order" name="date_order" class="datetime" size="32" value="<?php echo (date_is_null( $t_version->date_order ) ? '' : string_attribute( date( config_get( 'calendar_date_format' ), $t_version->date_order ) ) ) ?>" /></span>
+				<span class="label-style"></span>
+			</div>
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-version-description"><span><?php echo lang_get( 'description' ) ?></span></label>
+				<span class="textarea"><textarea id="proj-version-description" name="description" cols="60" rows="5"><?php echo string_attribute( $t_version->description ) ?></textarea></span>
+				<span class="label-style"></span>
+			</div>
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-version-released"><span><?php echo lang_get( 'released' ) ?></span></label>
+				<span class="checkbox"><input type="checkbox" id="proj-version-released" name="released" <?php check_checked( $t_version->released, VERSION_RELEASED ); ?> /></span>
+				<span class="label-style"></span>
+			</div>
+			<div class="field-container <?php echo helper_alternate_class_no_attribute(); ?>">
+				<label for="proj-version-obsolete"><span><?php echo lang_get( 'obsolete' ) ?></span></label>
+				<span class="checkbox"><input type="checkbox" id="proj-version-obsolete" name="obsolete" <?php check_checked( $t_version->obsolete, true ); ?> /></span>
+				<span class="label-style"></span>
+			</div>
+			
+			<?php event_signal( 'EVENT_MANAGE_VERSION_UPDATE_FORM', array( $t_version->id ) ); ?>
+			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'update_version_button' ) ?>" /></span>
+		</fieldset>
+	</form>
+</div>
 
-<div class="border center">
-	<form method="post" action="manage_proj_ver_delete.php">
-	<?php echo form_security_field( 'manage_proj_ver_delete' ) ?>
-	<input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" />
-	<input type="submit" class="button" value="<?php echo lang_get( 'delete_version_button' ) ?>" />
+<div class="form-container">
+	<form method="post" action="manage_proj_ver_delete.php" class="action-button">
+		<fieldset>
+			<?php echo form_security_field( 'manage_proj_ver_delete' ) ?>
+			<input type="hidden" name="version_id" value="<?php echo string_attribute( $t_version->id ) ?>" />
+			<input type="submit" class="button" value="<?php echo lang_get( 'delete_version_button' ) ?>" />
+		</fieldset>
 	</form>
 </div>