diff --git a/src/administrator/components/com_weblinks/tmpl/weblink/edit.php b/src/administrator/components/com_weblinks/tmpl/weblink/edit.php
index 46ad72a..fff3838 100644
--- a/src/administrator/components/com_weblinks/tmpl/weblink/edit.php
+++ b/src/administrator/components/com_weblinks/tmpl/weblink/edit.php
@@ -37,15 +37,19 @@ $tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
 
 	<?php echo LayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
-	<div class="form-horizontal">
+	<div class="main-card">
 		<?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', array('active' => 'details')); ?>
 
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', empty($this->item->id) ? Text::_('COM_WEBLINKS_NEW_WEBLINK', true) : Text::_('COM_WEBLINKS_EDIT_WEBLINK', true)); ?>
 		<div class="row">
 			<div class="col-md-9">
 				<div class="form-vertical">
-					<?php echo $this->form->renderField('url'); ?>
-					<?php echo $this->form->renderField('description'); ?>
+					<div>
+						<fieldset class="adminform">
+							<?php echo $this->form->renderField('url'); ?>
+							<?php echo $this->form->renderField('description'); ?>
+						</fieldset>
+					</div>
 				</div>
 			</div>
 			<div class="col-md-3">
@@ -55,33 +59,47 @@ $tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=c
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'images', Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS', true)); ?>
-			<div class="row">
-				<div class="col-md-6">
-					<?php echo $this->form->renderField('images'); ?>
-					<?php foreach ($this->form->getGroup('images') as $field) : ?>
-						<?php echo $field->renderField(); ?>
-					<?php endforeach; ?>
-				</div>
+		<div class="row">
+			<div class="col-12">
+				<fieldset id="fieldset-image; ?>" class="options-form">
+					<legend><?php echo Text::_('JGLOBAL_FIELDSET_IMAGE_OPTIONS'); ?></legend>
+					<div>
+						<?php echo $this->form->renderField('imaJGLOBAL_FIELDSET_IMAGE_OPTIONSges'); ?>
+						<?php foreach ($this->form->getGroup('images') as $field) : ?>
+							<?php echo $field->renderField(); ?>
+						<?php endforeach; ?>
+					</div>
+				</fieldset>
 			</div>
+		</div>
 
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
 		<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'publishing', Text::_('JGLOBAL_FIELDSET_PUBLISHING', true)); ?>
-		<div class="row form-horizontal-desktop">
-			<div class="col-md-6">
-				<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+			<div class="row">
+				<div class="col-12 col-lg-6">
+					<fieldset id="fieldset-publishingdata" class="options-form">
+						<legend><?php echo Text::_('JGLOBAL_FIELDSET_PUBLISHING'); ?></legend>
+						<?php echo LayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+					</fieldset>
+				</div>
+				<div class="col-12 col-lg-6">
+					<fieldset id="fieldset-metadata" class="options-form">
+						<legend><?php echo Text::_('JGLOBAL_FIELDSET_METADATA_OPTIONS'); ?></legend>
+						<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
+					</fieldset>
+				</div>
 			</div>
-			<div class="col-md-6">
-				<?php echo LayoutHelper::render('joomla.edit.metadata', $this); ?>
-			</div>
-		</div>
 		<?php echo HTMLHelper::_('uitab.endTab'); ?>
 
 		<?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
 
 		<?php if (!$isModal && $assoc) : ?>
 			<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
-			<?php echo $this->loadTemplate('associations'); ?>
+				<fieldset id="fieldset-associations" class="options-form">
+					<legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
+					<?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
+				</fieldset>
 			<?php echo HTMLHelper::_('uitab.endTab'); ?>
 		<?php elseif ($isModal && $assoc) : ?>
 			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>