diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
index 8833be36022..f536737199d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -22,6 +22,7 @@
 public class GuiStyleConstants {
 	
 	public static final String CLASS_BOX = "box";
+	public static final String CLASS_BOX_DEFAULT = "box-default";
 	
 	public static final String CLASS_OBJECT_USER_ICON = "fa fa-user";
 	public static final String CLASS_OBJECT_USER_ICON_COLORED = CLASS_OBJECT_USER_ICON + " object-user-color";
@@ -60,6 +61,7 @@ public class GuiStyleConstants {
 
 	public static final String CLASS_OBJECT_WORK_ITEM_ICON = "fa fa-inbox";
 	public static final String CLASS_OBJECT_WORK_ITEM_ICON_COLORED = CLASS_OBJECT_WORK_ITEM_ICON + " object-task-color";		// TODO
+	public static final String CLASS_OBJECT_WORK_ITEM_BOX_CSS_CLASSES = "object-task-box"; // TODO
 
 	public static final String CLASS_OBJECT_CERT_DEF_ICON = "fa fa-certificate";
 	public static final String CLASS_OBJECT_CERT_DEF_ICON_COLORED = CLASS_OBJECT_CERT_DEF_ICON + " object-task-color";		// TODO
@@ -99,6 +101,9 @@ public class GuiStyleConstants {
 	public static final String CLASS_ICON_NO_OBJECTS = "fa fa-times";
 	public static final String CLASS_ICON_ACTIVATION_ACTIVE = "fa fa-check";
 	public static final String CLASS_ICON_ACTIVATION_INACTIVE = "fa fa-times";
+	public static final String CLASS_ICON_ASSIGNMENTS = "fa fa-bank";
+	public static final String CLASS_SHADOW_ICON_REQUEST = "fa fa-pencil-square-o";
+	public static final String CLASS_ICON_TACHOMETER = "fa fa-tachometer";
 
 	public static final String CLASS_OP_RESULT_STATUS_ICON_UNKNOWN_COLORED = "fa fa-question-circle text-warning";
 	public static final String CLASS_OP_RESULT_STATUS_ICON_SUCCESS_COLORED = "fa fa-check-circle text-success";
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
index acaacd2727e..b8aa64c6057 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -550,6 +550,19 @@ public static String getName(PrismObject object) {
 
 		return name != null ? name.getOrig() : null;
 	}
+	
+	public static String getDisplayNameOrName(PrismObject object) {
+		if (object == null) {
+			return null;
+		}
+		if (object.canRepresent(OrgType.class)) {
+					PolyString displayName = getValue(object, OrgType.F_DISPLAY_NAME, PolyString.class);
+					if (displayName != null && displayName.getOrig() != null) {
+						return displayName.getOrig();
+					}
+		}
+		return getName(object);
+	}
 
 	public static String getIdentification(ObjectType object) {
 		if (object == null) {
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
index 9e13dc56bf5..84d173b449d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
@@ -60,9 +60,12 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
 
 /**
+ * TODO: unify with AssignmentItemDto
+ * 
  * @author lazyman
  */
 public class AssignmentEditorDto extends SelectableBean implements Comparable<AssignmentEditorDto> {
+	private static final long serialVersionUID = 1L;
 
 	private static final Trace LOGGER = TraceManager.getTrace(AssignmentEditorDto.class);
 
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
index abee48a7349..a1da5841fa4 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
@@ -29,22 +29,22 @@
  */
 public enum AssignmentEditorDtoType {
 
-    ORG_UNIT(OrgType.class, OrgType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_ORG_ICON_COLORED),
+    ORG_UNIT(OrgType.class, OrgType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_ORG_ICON),
 
-    ROLE(RoleType.class, RoleType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_ROLE_ICON_COLORED),
+    ROLE(RoleType.class, RoleType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_ROLE_ICON),
     
-    SERVICE(ServiceType.class, ServiceType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_SERVICE_ICON_COLORED),
+    SERVICE(ServiceType.class, ServiceType.COMPLEX_TYPE, GuiStyleConstants.CLASS_OBJECT_SERVICE_ICON),
 
-    CONSTRUCTION(null, null, GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON_COLORED);
+    CONSTRUCTION(null, null, GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON);
 
     private Class<? extends ObjectType> type;
     private QName qname;
-    private String coloredIconCssClass;
+    private String iconCssClass;
 
-    private AssignmentEditorDtoType(Class<? extends ObjectType> type, QName qname, String coloredIconCssClass) {
+    private AssignmentEditorDtoType(Class<? extends ObjectType> type, QName qname, String iconCssClass) {
         this.type = type;
         this.qname = qname;
-        this.coloredIconCssClass = coloredIconCssClass;
+        this.iconCssClass = iconCssClass;
     }
 
     public Class<? extends ObjectType> getType() {
@@ -83,7 +83,7 @@ public static AssignmentEditorDtoType getType(QName type) {
         throw new IllegalArgumentException("Unknown assignment type '" + type + "'.");
     }
 
-	public String getColoredIconCssClass() {
-		return coloredIconCssClass;
+	public String getIconCssClass() {
+		return iconCssClass;
 	}
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
index 6d4562d74c1..f287ae76a8b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -800,7 +800,7 @@ public String getObject() {
                 
                 if (targetObject == null) {
                 	AssignmentEditorDtoType type = assignmentEditorDto.getType();
-                    return type.getColoredIconCssClass();
+                    return type.getIconCssClass();
                 } else {
                 	return WebComponentUtil.createDefaultIcon(targetObject);
                 }                
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.html
index 25bbbdcee17..3cae8d718f9 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <span wicket:id="targetName" class="targetName" />
-    <span wicket:id="targetDisplayName" class="targetDisplayName" />
-    <span wicket:id="targetRelation" class="targetRelation" />
+    <span wicket:id="targetName" class="target-name" />
+    <span wicket:id="targetDisplayName" class="target-display-name" />
+    <span wicket:id="targetRelation" class="target-relation" />
 </wicket:panel>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.java
index 3c9d818bd40..76e8337ee48 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentHeaderPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package com.evolveum.midpoint.web.component.assignment;
 
-import com.evolveum.midpoint.web.component.util.SimplePanel;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.web.page.admin.home.dto.AssignmentItemDto;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
@@ -25,18 +25,19 @@
 /**
  * @author lazyman
  */
-public class AssignmentHeaderPanel extends SimplePanel<AssignmentItemDto> {
+public class AssignmentHeaderPanel extends BasePanel<AssignmentItemDto> {
+	private static final long serialVersionUID = 1L;
 
-    private static final String ID_TARGET_NAME = "targetName";
+	private static final String ID_TARGET_NAME = "targetName";
     private static final String ID_TARGET_DISPLAY_NAME = "targetDisplayName";
     private static final String ID_TARGET_RELATION = "targetRelation";
 
     public AssignmentHeaderPanel(String id, IModel<AssignmentItemDto> model) {
         super(id, model);
+        initLayout();
     }
 
-    @Override
-    protected void initLayout() {
+    private void initLayout() {
         add(new Label(ID_TARGET_NAME, new PropertyModel<String>(getModel(), AssignmentItemDto.F_NAME)));
         add(new Label(ID_TARGET_DISPLAY_NAME, new PropertyModel<String>(getModel(), AssignmentItemDto.F_DESCRIPTION)));
         add(new Label(ID_TARGET_RELATION, new PropertyModel<String>(getModel(), AssignmentItemDto.F_RELATION)));
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
index dbb58d5ab1e..03a5a17d07d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -67,7 +67,8 @@ private static PropertyColumn createPropertyColumn(String name, String sortableP
 			final String expression, final boolean multivalue) {
 
 		return new PropertyColumn(createStringResource(name), sortableProperty, expression) {
-
+			private static final long serialVersionUID = 1L;
+			
 			@Override
 			public void populateItem(Item item, String componentId, IModel rowModel) {
 				if (multivalue) {
@@ -161,11 +162,12 @@ private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getDefa
 			@Override
 			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
 				return new AbstractReadOnlyModel() {
+					private static final long serialVersionUID = 1L;
+
 					@Override
 					public String getObject() {
 						T object = rowModel.getObject().getValue();
 						return WebComponentUtil.createDefaultIcon(object.asPrismObject());
-						
 					}
 				};
 
@@ -224,94 +226,94 @@ public String getObject() {
 		};
 	}
 	
-private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getRoleIconColumn(){
-	return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
-		private static final long serialVersionUID = 1L;
-
-		@Override
-		protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
-			return new AbstractReadOnlyModel<String>() {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public String getObject() {
-					T role = rowModel.getObject().getValue();
-					return WebComponentUtil.createRoleIcon(role.asPrismContainer());
-				}
-			};
-		}
-	};
+	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getRoleIconColumn(){
+		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
+			private static final long serialVersionUID = 1L;
+	
+			@Override
+			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
+				return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
+	
+					@Override
+					public String getObject() {
+						T role = rowModel.getObject().getValue();
+						return WebComponentUtil.createRoleIcon(role.asPrismContainer());
+					}
+				};
+			}
+		};
 	}
 
-private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getOrgIconColumn(){
-	return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
-		private static final long serialVersionUID = 1L;
-
-		@Override
-		protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
-			return new AbstractReadOnlyModel<String>() {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public String getObject() {
-					T org = rowModel.getObject().getValue();
-					return WebComponentUtil.createOrgIcon(org.asPrismContainer());
-				}
-			};
-		}
-	};
-}
-
-private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getServiceIconColumn(){
-	return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
-
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 1L;
-
-		@Override
-		protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
-			return new AbstractReadOnlyModel<String>() {
-
-				/**
-				 * 
-				 */
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public String getObject() {
-					T service = rowModel.getObject().getValue();
-					return WebComponentUtil.createServiceIcon(service.asPrismContainer());
-				}
-			};
-		}
-	};
-}
-
-private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getTaskIconColumn(){
-	return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
-
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = 1L;
-
-		@Override
-		protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
-			return new AbstractReadOnlyModel<String>() {
+	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getOrgIconColumn(){
+		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
+			private static final long serialVersionUID = 1L;
+	
+			@Override
+			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
+				return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
+	
+					@Override
+					public String getObject() {
+						T org = rowModel.getObject().getValue();
+						return WebComponentUtil.createOrgIcon(org.asPrismContainer());
+					}
+				};
+			}
+		};
+	}
 
-				private static final long serialVersionUID = 1L;
+	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getServiceIconColumn(){
+		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
+	
+			/**
+			 * 
+			 */
+			private static final long serialVersionUID = 1L;
+	
+			@Override
+			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
+				return new AbstractReadOnlyModel<String>() {
+	
+					/**
+					 * 
+					 */
+					private static final long serialVersionUID = 1L;
+	
+					@Override
+					public String getObject() {
+						T service = rowModel.getObject().getValue();
+						return WebComponentUtil.createServiceIcon(service.asPrismContainer());
+					}
+				};
+			}
+		};
+	}
 
-				@Override
-				public String getObject() {
-					T task = rowModel.getObject().getValue();
-					return WebComponentUtil.createTaskIcon(task.asPrismContainer());
-				}
-			};
-		}
-	};
-}
+	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getTaskIconColumn(){
+		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
+	
+			/**
+			 * 
+			 */
+			private static final long serialVersionUID = 1L;
+	
+			@Override
+			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
+				return new AbstractReadOnlyModel<String>() {
+	
+					private static final long serialVersionUID = 1L;
+	
+					@Override
+					public String getObject() {
+						T task = rowModel.getObject().getValue();
+						return WebComponentUtil.createTaskIcon(task.asPrismContainer());
+					}
+				};
+			}
+		};
+	}
 
 	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getAccessCertificationDefinitionIconColumn(){
 		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
@@ -333,23 +335,27 @@ public String getObject() {
 
 
 	private static <T extends ObjectType> IColumn<SelectableBean<T>, String> getResourceIconColumn(){
-	return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
-		private static final long serialVersionUID = 1L;
-
-		@Override
-		protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
-			return new AbstractReadOnlyModel<String>() {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public String getObject() {
-					T resource = rowModel.getObject().getValue();
-					return WebComponentUtil.createResourceIcon(resource.asPrismContainer());
-				}
-			};
-		}
-	};
-}
+		return new IconColumn<SelectableBean<T>>(createIconColumnHeaderModel()) {
+			private static final long serialVersionUID = 1L;
+	
+			@Override
+			protected IModel<String> createIconModel(final IModel<SelectableBean<T>> rowModel) {
+				return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
+	
+					@Override
+					public String getObject() {
+						T resource = rowModel.getObject().getValue();
+						if (resource == null) {
+							return GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON;
+						} else {
+							return WebComponentUtil.createResourceIcon(resource.asPrismContainer());
+						}
+					}
+				};
+			}
+		};
+	}
 
 	public static StringResourceModel createStringResource(String resourceKey, Object... objects) {
 		return new StringResourceModel(resourceKey).setModel(new Model<String>()).setDefaultValue(resourceKey)
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
index 1d632ba4b47..07b2fa260a3 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -32,59 +32,12 @@
 		<div class="row">
 			<div class="col-md-6">
 				<div wicket:id="personalInfo" />
-				<div wicket:id="assignments" />
-
 			</div>
 
 			<div class="col-md-6">
 				<div wicket:id="systemInfo" />
-				<div wicket:id="accounts" />
 			</div>
 		</div>
-
-<!-- 		<table cellpadding="0" cellspacing="0" style="display: block;"> -->
-<!-- 			<tbody style="height: 100%;"> -->
-<!-- 				<tr style="height: 100%;"> -->
-<!-- 					<td style="height: 100%;"> -->
-<!-- 						<table cellpadding="5" style="height: 100%;"> -->
-<!-- 							<tbody style="height: 100%;"> -->
-<!-- 								<tr> -->
-<!-- 									<td><div wicket:id="draggable1" /></td> -->
-<!-- 								</tr> -->
-<!-- 								<tr> -->
-<!-- 									<td><div wicket:id="draggableDroppable1" /></td> -->
-<!-- 								</tr> -->
-
-<!-- 								<tr> -->
-<!-- 									<td style="vertical-align: top; height: 100%;"> -->
-<!-- 										<div wicket:id="droppable1" /> -->
-<!-- 									</td> -->
-<!-- 								</tr> -->
-<!-- 							</tbody> -->
-<!-- 						</table> -->
-<!-- 					</td> -->
-
-<!-- 					<td><table cellpadding="5" style="height: 100%;"> -->
-<!-- 							<tbody> -->
-<!-- 								<tr> -->
-<!-- 									<td><div wicket:id="draggable2" /></td> -->
-<!-- 								</tr> -->
-
-<!-- 								<tr> -->
-<!-- 									<td><div wicket:id="draggableDroppable2" /></td> -->
-<!-- 								</tr> -->
-<!-- 								<tr> -->
-<!-- 									<td style="vertical-align: top; height: 100%;"><div -->
-<!-- 											wicket:id="droppable2" /></td> -->
-<!-- 								</tr> -->
-<!-- 							</tbody> -->
-<!-- 						</table></td> -->
-
-<!-- 				</tr> -->
-
-<!-- 			</tbody> -->
-<!-- 		</table> -->
-
 	</wicket:extend>
 </body>
 </html>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
index c524011021c..ed513f5e5e1 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,73 +13,48 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.evolveum.midpoint.web.page.admin.home;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
-import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.component.IRequestablePage;
-import org.springframework.security.core.Authentication;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
-import com.evolveum.midpoint.prism.PrismContainer;
-import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.PrismReference;
-import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.query.EqualFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.schema.GetOperationOptions;
-import com.evolveum.midpoint.schema.SelectorOptions;
+import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
-import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.util.exception.CommunicationException;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.AuthorizationAction;
 import com.evolveum.midpoint.web.application.PageDescriptor;
-import com.evolveum.midpoint.web.component.SecurityContextAwareCallable;
-import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDtoType;
 import com.evolveum.midpoint.web.component.box.InfoBoxPanel;
 import com.evolveum.midpoint.web.component.box.InfoBoxType;
-import com.evolveum.midpoint.web.component.util.CallableResult;
-import com.evolveum.midpoint.web.page.admin.home.component.AsyncDashboardPanel;
-import com.evolveum.midpoint.web.page.admin.home.component.DashboardColor;
+import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.web.page.admin.home.component.DashboardPanel;
-import com.evolveum.midpoint.web.page.admin.home.component.MyAccountsPanel;
-import com.evolveum.midpoint.web.page.admin.home.component.MyAssignmentsPanel;
 import com.evolveum.midpoint.web.page.admin.home.component.PersonalInfoPanel;
 import com.evolveum.midpoint.web.page.admin.home.component.SystemInfoPanel;
-import com.evolveum.midpoint.web.page.admin.home.dto.AccountCallableResult;
-import com.evolveum.midpoint.web.page.admin.home.dto.AssignmentItemDto;
-import com.evolveum.midpoint.web.page.admin.home.dto.SimpleAccountDto;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
 import com.evolveum.midpoint.web.page.admin.roles.PageRoles;
 import com.evolveum.midpoint.web.page.admin.server.PageTasks;
 import com.evolveum.midpoint.web.page.admin.services.PageServices;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
 import com.evolveum.midpoint.web.page.admin.users.PageUsers;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ActivationStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AvailabilityStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationalStateType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskExecutionStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 /**
  * @author lazyman
@@ -90,12 +65,11 @@
         @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_DASHBOARD_URL,
                 label = "PageDashboard.auth.dashboard.label", description = "PageDashboard.auth.dashboard.description")})
 public class PageDashboard extends PageAdminHome {
+	private static final long serialVersionUID = 1L;
 
-    private static final Trace LOGGER = TraceManager.getTrace(PageDashboard.class);
+	private static final Trace LOGGER = TraceManager.getTrace(PageDashboard.class);
 
     private static final String DOT_CLASS = PageDashboard.class.getName() + ".";
-    private static final String OPERATION_LOAD_ACCOUNTS = DOT_CLASS + "loadAccounts";
-    private static final String OPERATION_LOAD_ASSIGNMENTS = DOT_CLASS + "loadAssignments";
 
     private static final String ID_INFO_BOX_USERS = "infoBoxUsers";
     private static final String ID_INFO_BOX_ORGS = "infoBoxOrgs";
@@ -105,8 +79,6 @@ public class PageDashboard extends PageAdminHome {
     private static final String ID_INFO_BOX_TASKS = "infoBoxTasks";
     
     private static final String ID_PERSONAL_INFO = "personalInfo";
-    private static final String ID_ACCOUNTS = "accounts";
-    private static final String ID_ASSIGNMENTS = "assignments";
     private static final String ID_SYSTEM_INFO = "systemInfo";
 
     private final Model<PrismObject<UserType>> principalModel = new Model<PrismObject<UserType>>();
@@ -128,79 +100,8 @@ protected void createBreadcrumb() {
     private void initLayout() {
     	initInfoBoxes();
         initPersonalInfo();
-        initMyAccounts();
-        initAssignments();
         initSystemInfo();
-        
-//        DraggablesAcceptedByDroppable defaultValues = new DraggablesAcceptedByDroppable("one", "two", "three");
-//        DraggableElement draggable1 = new DraggableElement("draggable1");
-//        add(draggable1);
-//        
-//       
-//        draggable1.setOutputMarkupId(true);
-//
-//
-//        DroppableElement droppable1 = new DroppableElement("droppable1", defaultValues);
-//        add(droppable1);
-//        
-//        add(new DraggableAndDroppableElement("draggableDroppable1", new Model<String>("Drag me!"), defaultValues));
-//
-//        
-//        DraggableElement draggable2 = new DraggableElement("draggable2");
-//        add(draggable2);
-//        draggable2.setOutputMarkupId(true);
-//
-//        add(new DraggableAndDroppableElement("draggableDroppable2", new Model<String>("Drag me!"), defaultValues));
-//
-//        add(new DroppableElement("droppable2", defaultValues));
-    }
-
-	private AccountCallableResult<List<SimpleAccountDto>> loadAccounts() throws Exception {
-        LOGGER.debug("Loading accounts.");
-
-        AccountCallableResult callableResult = new AccountCallableResult();
-        List<SimpleAccountDto> list = new ArrayList<SimpleAccountDto>();
-        callableResult.setValue(list);
-        PrismObject<UserType> user = principalModel.getObject();
-        if (user == null) {
-            return callableResult;
-        }
-
-        Task task = createSimpleTask(OPERATION_LOAD_ACCOUNTS);
-        OperationResult result = task.getResult();
-        callableResult.setResult(result);
-        GetOperationOptions getOpts = GetOperationOptions.createResolve();
-        getOpts.setNoFetch(Boolean.TRUE);
-        Collection<SelectorOptions<GetOperationOptions>> options =
-                SelectorOptions.createCollection(ShadowType.F_RESOURCE, getOpts);
-
-        
-        List<ObjectReferenceType> references = user.asObjectable().getLinkRef();
-        for (ObjectReferenceType reference : references) {
-            PrismObject<ShadowType> account = WebModelServiceUtils.loadObject(ShadowType.class, reference.getOid(),
-                    options, this, task, result);
-            if (account == null) {
-                continue;
-            }
-
-            ShadowType accountType = account.asObjectable();
 
-            OperationResultType fetchResult = accountType.getFetchResult();
-
-            if (fetchResult != null) {
-                callableResult.getFetchResults().add(OperationResult.createOperationResult(fetchResult));
-            }
-
-            ResourceType resource = accountType.getResource();
-            String resourceName = WebComponentUtil.getName(resource);
-            list.add(new SimpleAccountDto(WebComponentUtil.getOrigStringFromPoly(accountType.getName()), resourceName));
-        }
-        result.recordSuccessIfUnknown();
-        result.recomputeStatus();
-
-        LOGGER.debug("Finished accounts loading.");
-
-        return callableResult;
     }
 	
     private void initInfoBoxes() {
@@ -356,7 +257,9 @@ private Component createTaskInfoBoxPanel(OperationResult result, Task task) {
 
     private void initPersonalInfo() {
         DashboardPanel personalInfo = new DashboardPanel(ID_PERSONAL_INFO, null,
-                createStringResource("PageDashboard.personalInfo"), "fa fa-fw fa-male", DashboardColor.GRAY) {
+                createStringResource("PageDashboard.personalInfo"), GuiStyleConstants.CLASS_OBJECT_USER_BOX_CSS_CLASSES, 
+                GuiStyleConstants.CLASS_OBJECT_USER_BOX_CSS_CLASSES) {
+        	private static final long serialVersionUID = 1L;
 
             @Override
             protected Component getMainComponent(String componentId) {
@@ -368,9 +271,11 @@ protected Component getMainComponent(String componentId) {
 
     private void initSystemInfo() {
         DashboardPanel systemInfo = new DashboardPanel(ID_SYSTEM_INFO, null,
-                createStringResource("PageDashboard.systemInfo"), "fa fa-tachometer", DashboardColor.GREEN) {
+                createStringResource("PageDashboard.systemInfo"), 
+                GuiStyleConstants.CLASS_ICON_TACHOMETER, GuiStyleConstants.CLASS_OBJECT_RESOURCE_BOX_CSS_CLASSES) {
+			private static final long serialVersionUID = 1L;
 
-            @Override
+			@Override
             protected Component getMainComponent(String componentId) {
                 return new SystemInfoPanel(componentId);
             }
@@ -378,165 +283,8 @@ protected Component getMainComponent(String componentId) {
         add(systemInfo);
     }
 
-    private void initMyAccounts() {
-        AsyncDashboardPanel<Object, List<SimpleAccountDto>> accounts =
-                new AsyncDashboardPanel<Object, List<SimpleAccountDto>>(ID_ACCOUNTS, createStringResource("PageDashboard.accounts"),
-                        "fa fa-fw fa-external-link", DashboardColor.BLUE) {
-
-                    @Override
-                    protected SecurityContextAwareCallable<CallableResult<List<SimpleAccountDto>>> createCallable(
-                            Authentication auth, IModel<Object> callableParameterModel) {
 
-                        return new SecurityContextAwareCallable<CallableResult<List<SimpleAccountDto>>>(
-                                getSecurityEnforcer(), auth) {
 
-                            @Override
-                            public AccountCallableResult<List<SimpleAccountDto>> callWithContextPrepared()
-                                    throws Exception {
-                                return loadAccounts();
-                            }
-                        };
-                    }
-
-                    @Override
-                    protected Component getMainComponent(String markupId) {
-                        return new MyAccountsPanel(markupId,
-                                new PropertyModel<List<SimpleAccountDto>>(getModel(), CallableResult.F_VALUE));
-                    }
-
-                    @Override
-                    protected void onPostSuccess(AjaxRequestTarget target) {
-                        showFetchResult();
-                        super.onPostSuccess(target);
-                    }
-
-                    @Override
-                    protected void onUpdateError(AjaxRequestTarget target, Exception ex) {
-                        showFetchResult();
-                        super.onUpdateError(target, ex);
-                    }
-
-                    private void showFetchResult() {
-                        AccountCallableResult<List<SimpleAccountDto>> result =
-                                (AccountCallableResult<List<SimpleAccountDto>>) getModel().getObject();
-
-                        PageBase page = (PageBase) getPage();
-                        for (OperationResult res : result.getFetchResults()) {
-                            if (!WebComponentUtil.isSuccessOrHandledError(res)) {
-                                page.showResult(res);
-                            }
-                        }
-                    }
-                };
-        add(accounts);
-    }
 
-    private void initAssignments() {
-        AsyncDashboardPanel<Object, List<AssignmentItemDto>> assignedOrgUnits =
-                new AsyncDashboardPanel<Object, List<AssignmentItemDto>>(ID_ASSIGNMENTS, createStringResource("PageDashboard.assignments"),
-                        "fa fa-fw fa-star", DashboardColor.YELLOW) {
-
-                    @Override
-                    protected SecurityContextAwareCallable<CallableResult<List<AssignmentItemDto>>> createCallable(
-                            Authentication auth, IModel callableParameterModel) {
-
-                        return new SecurityContextAwareCallable<CallableResult<List<AssignmentItemDto>>>(
-                                getSecurityEnforcer(), auth) {
-
-                            @Override
-                            public CallableResult<List<AssignmentItemDto>> callWithContextPrepared() throws Exception {
-                                return loadAssignments();
-                            }
-                        };
-                    }
-
-                    @Override
-                    protected Component getMainComponent(String markupId) {
-                        return new MyAssignmentsPanel(markupId,
-                                new PropertyModel<List<AssignmentItemDto>>(getModel(), CallableResult.F_VALUE));
-                    }
-                };
-        add(assignedOrgUnits);
-
-    }
-
-    private CallableResult<List<AssignmentItemDto>> loadAssignments() throws Exception {
-        LOGGER.debug("Loading assignments.");
-        CallableResult callableResult = new CallableResult();
-        List<AssignmentItemDto> list = new ArrayList<AssignmentItemDto>();
-        callableResult.setValue(list);
-
-        PrismObject<UserType> user = principalModel.getObject();
-        if (user == null || user.findContainer(UserType.F_ASSIGNMENT) == null) {
-            return callableResult;
-        }
-
-        Task task = createSimpleTask(OPERATION_LOAD_ASSIGNMENTS);
-        OperationResult result = task.getResult();
-        callableResult.setResult(result);
-
-        PrismContainer assignments = user.findContainer(UserType.F_ASSIGNMENT);
-        List<PrismContainerValue> values = assignments.getValues();
-        for (PrismContainerValue assignment : values) {
-            AssignmentItemDto item = createAssignmentItem(user, assignment, task, result);
-            if (item != null) {
-                list.add(item);
-            }
-        }
-        result.recordSuccessIfUnknown();
-        result.recomputeStatus();
-
-        Collections.sort(list);
-
-        LOGGER.debug("Finished assignments loading.");
-
-        return callableResult;
-    }
-
-    private AssignmentItemDto createAssignmentItem(PrismObject<UserType> user,
-                                                   PrismContainerValue assignment, Task task, OperationResult result) {
-        PrismReference targetRef = assignment.findReference(AssignmentType.F_TARGET_REF);
-        if (targetRef == null || targetRef.isEmpty()) {
-            //account construction
-            PrismContainer construction = assignment.findContainer(AssignmentType.F_CONSTRUCTION);
-            String name = null;
-            String description = null;
-            if (construction.getValue().asContainerable() != null && !construction.isEmpty()) {
-                ConstructionType constr = (ConstructionType) construction.getValue().asContainerable();
-                description =  (String) construction.getPropertyRealValue(ConstructionType.F_DESCRIPTION, String.class);
-
-                if (constr.getResourceRef() != null) {
-                    ObjectReferenceType resourceRef = constr.getResourceRef();
-
-                    PrismObject resource = WebModelServiceUtils.loadObject(ResourceType.class, resourceRef.getOid(), this, task, result);
-                    name = WebComponentUtil.getName(resource);
-                }
-            }
-
-            return new AssignmentItemDto(AssignmentEditorDtoType.CONSTRUCTION, name, description, null);
-        }
-
-        PrismReferenceValue refValue = targetRef.getValue();
-        PrismObject value = refValue.getObject();
-        if (value == null) {
-            //resolve reference
-            value = WebModelServiceUtils.loadObject(ObjectType.class, refValue.getOid(), this, task, result);
-        }
-
-        if (value == null) {
-            //we couldn't resolve assignment details
-            return new AssignmentItemDto(null, null, null, null);
-        }
-
-        String name = WebComponentUtil.getName(value);
-        AssignmentEditorDtoType type = AssignmentEditorDtoType.getType(value.getCompileTimeClass());
-        String relation = refValue.getRelation() != null ? refValue.getRelation().getLocalPart() : null;
-        String description = null;
-        if (RoleType.class.isAssignableFrom(value.getCompileTimeClass())) {
-            description = (String) value.getPropertyRealValue(RoleType.F_DESCRIPTION, String.class);
-        }
-
-        return new AssignmentItemDto(type, name, description, relation);
-    }
 
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html
index db8f9d98d2b..900db8af506 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 <wicket:panel>
     <div class="box" wicket:id="dashboardParent">
         <div class="box-header with-border" wicket:id="dashboardTitle">
-            <h3 class="box-title"><i wicket:id="icon"></i>&nbsp;<span wicket:id="title"/></h3>
+        	<i wicket:id="icon"/>
+            <h3 class="box-title"><span wicket:id="title"/></h3>
         </div>
         <div class="box-body" wicket:id="dashboardContent">
             <div wicket:id="preloaderContainer" style="margin: 10px 0; text-align: center;">
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
index 0801775bc3d..e5f3bf1aeb8 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
@@ -16,6 +16,7 @@
 
 package com.evolveum.midpoint.web.page.admin.home.component;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -36,8 +37,9 @@
  * @author lazyman
  */
 public abstract class AsyncDashboardPanel<V, T> extends AsyncUpdatePanel<V, CallableResult<T>> {
+	private static final long serialVersionUID = 1L;
 
-    protected static final String ID_DASHBOARD_PARENT = "dashboardParent";
+	protected static final String ID_DASHBOARD_PARENT = "dashboardParent";
     protected static final String ID_DASHBOARD_TITLE = "dashboardTitle";
     private static final String ID_TITLE = "title";
     private static final String ID_PRELOADER_CONTAINER = "preloaderContainer";
@@ -46,17 +48,17 @@ public abstract class AsyncDashboardPanel<V, T> extends AsyncUpdatePanel<V, Call
     private static final String ID_CONTENT = "content";
     private static final String ID_ICON = "icon";
 
-    public AsyncDashboardPanel(String id, IModel<String> title, String icon, DashboardColor color) {
-        this(id, title, icon, new Model(), color);
+    public AsyncDashboardPanel(String id, IModel<String> title, String icon, String boxCssClasses) {
+        this(id, title, icon, new Model(), boxCssClasses);
     }
 
     public AsyncDashboardPanel(String id, IModel<String> title, String icon, IModel<V> callableParameterModel,
-                               DashboardColor color) {
-        this(id, title, icon, callableParameterModel, Duration.seconds(DEFAULT_TIMER_DURATION), color);
+    		String boxCssClasses) {
+        this(id, title, icon, callableParameterModel, Duration.seconds(DEFAULT_TIMER_DURATION), boxCssClasses);
     }
 
     public AsyncDashboardPanel(String id, IModel<String> title, String icon, IModel<V> callableParameterModel,
-                               Duration durationSecs, DashboardColor color) {
+                               Duration durationSecs, String boxCssClasses) {
         super(id, callableParameterModel, durationSecs);
         
         initLayout();
@@ -67,11 +69,11 @@ public AsyncDashboardPanel(String id, IModel<String> title, String icon, IModel<
         Label label = (Label) dashboardTitle.get(ID_TITLE);
         label.setDefaultModel(title);
 
-        if (color == null) {
-            color = DashboardColor.GRAY;
+        if (boxCssClasses == null) {
+        	boxCssClasses = GuiStyleConstants.CLASS_BOX_DEFAULT;
         }
         Component dashboardParent = get(ID_DASHBOARD_PARENT);
-        dashboardParent.add(new AttributeAppender("class", " " + color.getCssClass()));
+        dashboardParent.add(new AttributeAppender("class", " " + boxCssClasses));
 
         WebMarkupContainer iconI = new WebMarkupContainer(ID_ICON);
         iconI.add(AttributeModifier.replace("class", icon));
@@ -89,7 +91,6 @@ private void initLayout() {
         dashboardTitle.add(title);
 
         WebMarkupContainer dashboardContent = new WebMarkupContainer(ID_DASHBOARD_CONTENT);
-        dashboardContent.add(AttributeModifier.append("style", getDashboardBodyCss()));
         dashboardParent.add(dashboardContent);
 
         dashboardContent.add(new Label(ID_CONTENT));
@@ -107,10 +108,6 @@ public boolean isVisible() {
         preloaderContainer.add(getLoadingComponent(ID_PRELOADER));
     }
 
-    public String getDashboardBodyCss() {
-        return "padding: 0px;";
-    }
-
     @Override
     protected void onPostSuccess(AjaxRequestTarget target) {
         WebMarkupContainer dashboardContent = getDashboardContent();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardColor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardColor.java
deleted file mode 100644
index f8dac465375..00000000000
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardColor.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.evolveum.midpoint.web.page.admin.home.component;
-
-/**
- * @author lazyman
- */
-public enum DashboardColor {
-
-    GRAY("box-default"),
-    BLUE("box-info"),
-    GREEN("box-success"),
-    YELLOW("box-warning"),
-    RED("box-danger");
-
-    private String cssClass;
-
-    private DashboardColor(String cssClass) {
-        this.cssClass = cssClass;
-    }
-
-    public String getCssClass() {
-        return cssClass;
-    }
-}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html
index e44fbbcc40e..ba4543d707b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html
@@ -19,7 +19,8 @@
 <wicket:panel>
     <div class="box" wicket:id="dashboardParent">
         <div class="box-header with-border" wicket:id="dashboardTitle">
-            <h3 class="box-title"><i wicket:id="icon"></i>&nbsp;<span wicket:id="title"/></h3>
+        	<i wicket:id="icon"/>
+            <h3 class="box-title"><span wicket:id="title"/></h3>
         </div>
         <div class="box-body" wicket:id="dashboardContent">
             <div wicket:id="content"/>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java
index ff3f4036a94..76c3a5fa03a 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,72 +13,60 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.evolveum.midpoint.web.page.admin.home.component;
 
-import com.evolveum.midpoint.web.component.util.SimplePanel;
-import org.apache.commons.lang.StringUtils;
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 
 import java.io.Serializable;
 
 /**
  * @author lazyman
  */
-public abstract class DashboardPanel<T extends Serializable> extends SimplePanel<T> {
-
-    private static final String ID_DASHBOARD_PARENT = "dashboardParent";
+public abstract class DashboardPanel<T extends Serializable> extends BasePanel<T> {
+	private static final long serialVersionUID = 1L;
+	
+	private static final String ID_DASHBOARD_PARENT = "dashboardParent";
     private static final String ID_DASHBOARD_TITLE = "dashboardTitle";
     private static final String ID_TITLE = "title";
     private static final String ID_DASHBOARD_CONTENT = "dashboardContent";
     private static final String ID_CONTENT = "content";
     private static final String ID_ICON = "icon";
 
-    public DashboardPanel(String id, IModel<T> model, IModel<String> title, String icon, DashboardColor color) {
+    public DashboardPanel(String id, IModel<T> model, IModel<String> titleModel, String icon, String boxCssClasses) {
         super(id, model);
-
-        WebMarkupContainer dashboardTitle = (WebMarkupContainer) get(
-                createComponentPath(ID_DASHBOARD_PARENT, ID_DASHBOARD_TITLE));
-
-        Label label = (Label) dashboardTitle.get(ID_TITLE);
-        label.setDefaultModel(title);
-
-        if (color == null) {
-            color = DashboardColor.GRAY;
-        }
-        Component dashboardParent = get(ID_DASHBOARD_PARENT);
-        dashboardParent.add(new AttributeAppender("class", " " + color.getCssClass()));
-
-        WebMarkupContainer iconI = new WebMarkupContainer(ID_ICON);
-        iconI.add(AttributeModifier.replace("class", icon));
-        dashboardTitle.add(iconI);
-    }
-
-    public String getDashboardBodyCss() {
-        return "padding: 0px;";
+        initLayout(titleModel, icon, boxCssClasses);
     }
 
-    @Override
-    protected void initLayout() {
+    private void initLayout(IModel<String> titleModel, String icon, String boxCssClasses) {
+    	if (boxCssClasses == null) {
+        	boxCssClasses = GuiStyleConstants.CLASS_BOX_DEFAULT;
+        }
+    	
         WebMarkupContainer dashboardParent = new WebMarkupContainer(ID_DASHBOARD_PARENT);
+        dashboardParent.add(new AttributeAppender("class", " " + boxCssClasses));
         add(dashboardParent);
 
         WebMarkupContainer dashboardTitle = new WebMarkupContainer(ID_DASHBOARD_TITLE);
         dashboardParent.add(dashboardTitle);
         Label title = new Label(ID_TITLE);
         title.setRenderBodyOnly(true);
+        title.setDefaultModel(titleModel);
         dashboardTitle.add(title);
 
         WebMarkupContainer dashboardContent = new WebMarkupContainer(ID_DASHBOARD_CONTENT);
-        dashboardContent.add(AttributeModifier.append("style", getDashboardBodyCss()));
         dashboardContent.add(getMainComponent(ID_CONTENT));
         dashboardParent.add(dashboardContent);
+        
+        WebMarkupContainer iconI = new WebMarkupContainer(ID_ICON);
+        iconI.add(AttributeModifier.replace("class", icon));
+        dashboardTitle.add(iconI);
     }
 
     protected abstract Component getMainComponent(String markupId);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
index d0c8158dba2..0339a87b9db 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,14 @@
 
 package com.evolveum.midpoint.web.page.admin.home.component;
 
+import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.web.component.assignment.AssignmentHeaderPanel;
 import com.evolveum.midpoint.web.component.data.TablePanel;
 import com.evolveum.midpoint.web.component.data.column.IconColumn;
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
-import com.evolveum.midpoint.web.component.util.SimplePanel;
 import com.evolveum.midpoint.web.page.admin.home.dto.AssignmentItemDto;
+import com.evolveum.midpoint.web.page.admin.server.dto.OperationResultStatusPresentationProperties;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -37,40 +39,34 @@
 /**
  * @author lazyman
  */
-public class MyAssignmentsPanel extends SimplePanel<List<AssignmentItemDto>> {
+public class MyAssignmentsPanel extends BasePanel<List<AssignmentItemDto>> {
+	private static final long serialVersionUID = 1L;
 
     private static final String ID_ASSIGNMETNS_TABLE = "assignmentsTable";
 
     public MyAssignmentsPanel(String id, IModel<List<AssignmentItemDto>> model) {
         super(id, model);
+        initLayout();
     }
 
-    @Override
-    protected void initLayout() {
+    private void initLayout() {
         List<IColumn<AssignmentItemDto, String>> columns = new ArrayList<IColumn<AssignmentItemDto, String>>();
-        columns.add(new IconColumn<AssignmentItemDto>(createStringResource("MyAssignmentsPanel.assignment.type")) {
+        columns.add(new IconColumn<AssignmentItemDto>(null) {
+        	private static final long serialVersionUID = 1L;
 
             @Override
             protected IModel<String> createIconModel(final IModel<AssignmentItemDto> rowModel) {
                 return new AbstractReadOnlyModel<String>() {
+					private static final long serialVersionUID = 1L;
 
-                    @Override
+					@Override
                     public String getObject() {
                         AssignmentItemDto item = rowModel.getObject();
                         if (item.getType() == null) {
-                            return "silk-error";
+                            return OperationResultStatusPresentationProperties.FATAL_ERROR.getIcon();
                         }
 
-                        switch (item.getType()) {
-                            case CONSTRUCTION:
-                                return "silk-drive";
-                            case ORG_UNIT:
-                                return "silk-building";
-                            case ROLE:
-                                return "silk-user_suit";
-                            default:
-                                return "silk-error";
-                        }
+                        return item.getType().getIconCssClass();
                     }
                 };
             }
@@ -78,6 +74,7 @@ public String getObject() {
             @Override
             protected IModel<String> createTitleModel(final IModel<AssignmentItemDto> rowModel) {
                 return new AbstractReadOnlyModel<String>() {
+                	private static final long serialVersionUID = 1L;
 
                     @Override
                     public String getObject() {
@@ -103,13 +100,14 @@ public String getObject() {
 
         columns.add(new AbstractColumn<AssignmentItemDto, String>(
                 createStringResource("MyAssignmentsPanel.assignment.displayName")) {
+        	private static final long serialVersionUID = 1L;
 
             @Override
             public void populateItem(Item<ICellPopulator<AssignmentItemDto>> cellItem, String componentId,
                                      final IModel<AssignmentItemDto> rowModel) {
 
                 AssignmentHeaderPanel panel = new AssignmentHeaderPanel(componentId, rowModel);
-                panel.add(new AttributeModifier("class", "dashAssignmentHeader"));
+                panel.add(new AttributeModifier("class", "dash-assignment-header"));
                 cellItem.add(panel);
             }
         });
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AssignmentItemDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AssignmentItemDto.java
index 1be11e139d7..06015d7623c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AssignmentItemDto.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/AssignmentItemDto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,12 @@
 import java.io.Serializable;
 
 /**
+ * TODO: unify with AssignmentEditorDto
+ * 
  * @author lazyman
  */
 public class AssignmentItemDto implements Serializable, Comparable<AssignmentItemDto> {
+	private static final long serialVersionUID = 1L;
 
     public static final String F_TYPE = "type";
     public static final String F_NAME = "name";
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
index 8d525e323b0..cfa6b69719c 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.html
@@ -33,6 +33,15 @@
             <div wicket:id="requestPanel"/>
         </div>
     </div>
+    <div class="row">
+		<div class="col-md-6">
+			<div wicket:id="assignments" />
+		</div>
+		
+		<div class="col-md-6">
+			<div wicket:id="accounts" />
+		</div>
+	</div>
 </wicket:extend>
 </body>
 </html>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
index 507ee7172a5..ee75876725f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,37 @@
  */
 package com.evolveum.midpoint.web.page.self;
 
+import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType.F_WORK_ITEM_CREATED_TIMESTAMP;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.apache.wicket.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+import org.springframework.security.core.Authentication;
+
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
+import com.evolveum.midpoint.prism.PrismContainer;
+import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.prism.PrismReference;
+import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
+import com.evolveum.midpoint.schema.GetOperationOptions;
+import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
@@ -30,14 +55,18 @@
 import com.evolveum.midpoint.web.application.AuthorizationAction;
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.SecurityContextAwareCallable;
+import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDtoType;
 import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.web.component.util.CallableResult;
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.component.wf.WorkItemsPanel;
 import com.evolveum.midpoint.web.page.admin.home.component.AsyncDashboardPanel;
-import com.evolveum.midpoint.web.page.admin.home.component.DashboardColor;
+import com.evolveum.midpoint.web.page.admin.home.component.MyAccountsPanel;
+import com.evolveum.midpoint.web.page.admin.home.component.MyAssignmentsPanel;
 import com.evolveum.midpoint.web.page.admin.home.dto.AccountCallableResult;
+import com.evolveum.midpoint.web.page.admin.home.dto.AssignmentItemDto;
+import com.evolveum.midpoint.web.page.admin.home.dto.SimpleAccountDto;
 import com.evolveum.midpoint.web.page.admin.workflow.ProcessInstancesPanel;
 import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDto;
 import com.evolveum.midpoint.web.page.admin.workflow.dto.ProcessInstanceDtoProvider;
@@ -45,23 +74,18 @@
 import com.evolveum.midpoint.web.page.self.component.DashboardSearchPanel;
 import com.evolveum.midpoint.web.page.self.component.LinksPanel;
 import com.evolveum.midpoint.web.security.SecurityUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ConstructionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RichHyperlinkType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType;
-import org.apache.commons.lang.Validate;
-import org.apache.wicket.Application;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.springframework.security.core.Authentication;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType.F_WORK_ITEM_CREATED_TIMESTAMP;
 
 /**
  * @author Viliam Repan (lazyman)
@@ -81,14 +105,21 @@ public class PageSelfDashboard extends PageSelf {
     private static final String ID_WORK_ITEMS_PANEL = "workItemsPanel";
     private static final String ID_SEARCH_PANEL = "searchPanel";
     private static final String ID_REQUESTS_PANEL = "requestPanel";
+    private static final String ID_ACCOUNTS = "accounts";
+    private static final String ID_ASSIGNMENTS = "assignments";
+    
     private static final String DOT_CLASS = PageSelfDashboard.class.getName() + ".";
     private static final String OPERATION_LOAD_WORK_ITEMS = DOT_CLASS + "loadWorkItems";
     private static final String OPERATION_LOAD_REQUESTS = DOT_CLASS + "loadRequests";
+    private static final String OPERATION_LOAD_ACCOUNTS = DOT_CLASS + "loadAccounts";
+    private static final String OPERATION_LOAD_ASSIGNMENTS = DOT_CLASS + "loadAssignments";
+    private static final String OPERATION_LOAD_USER = DOT_CLASS + "loadUser";
+    private static final String OPERATION_GET_SYSTEM_CONFIG = DOT_CLASS + "getSystemConfiguration";
+    
     private static final int MAX_WORK_ITEMS = 1000;
     private static final int MAX_REQUESTS = 1000;
+
     private final Model<PrismObject<UserType>> principalModel = new Model<PrismObject<UserType>>();
-    private static final String OPERATION_LOAD_USER = DOT_CLASS + "loadUser";
-    private static final String OPERATION_GET_SYSTEM_CONFIG = DOT_CLASS + "getSystemConfiguration";
 
     public PageSelfDashboard() {
         principalModel.setObject(loadUser());
@@ -116,6 +147,8 @@ private void initLayout(){
             dashboardSearchPanel.setVisible(false);
         }
         LinksPanel linksPanel = new LinksPanel(ID_LINKS_PANEL, new IModel<List<RichHyperlinkType>>() {
+        	private static final long serialVersionUID = 1L;
+        	
             @Override
             public List<RichHyperlinkType> getObject() {
                 return loadLinksList();
@@ -139,14 +172,16 @@ public void detach() {
 
 		AsyncDashboardPanel<Object, List<WorkItemDto>> workItemsPanel =
                 new AsyncDashboardPanel<Object, List<WorkItemDto>>(ID_WORK_ITEMS_PANEL, createStringResource("PageSelfDashboard.workItems"),
-                        "fa fa-fw fa-tasks", DashboardColor.RED) {
+                        GuiStyleConstants.CLASS_OBJECT_WORK_ITEM_ICON, GuiStyleConstants.CLASS_OBJECT_WORK_ITEM_BOX_CSS_CLASSES) {
+					private static final long serialVersionUID = 1L;
 
-                    @Override
+					@Override
                     protected SecurityContextAwareCallable<CallableResult<List<WorkItemDto>>> createCallable(
                             Authentication auth, IModel callableParameterModel) {
 
                         return new SecurityContextAwareCallable<CallableResult<List<WorkItemDto>>>(
                                 getSecurityEnforcer(), auth) {
+                        	private static final long serialVersionUID = 1L;
 
                             @Override
                             public CallableResult<List<WorkItemDto>> callWithContextPrepared() throws Exception {
@@ -173,7 +208,8 @@ public boolean isVisible() {
 
         AsyncDashboardPanel<Object, List<ProcessInstanceDto>> myRequestsPanel =
                 new AsyncDashboardPanel<Object, List<ProcessInstanceDto>>(ID_REQUESTS_PANEL, createStringResource("PageSelfDashboard.myRequests"),
-                        "fa fa-fw fa-pencil-square-o", DashboardColor.GREEN) {
+                		 GuiStyleConstants.CLASS_SHADOW_ICON_REQUEST, GuiStyleConstants.CLASS_OBJECT_SERVICE_BOX_CSS_CLASSES) {
+        			private static final long serialVersionUID = 1L;
 
                     @Override
                     protected SecurityContextAwareCallable<CallableResult<List<ProcessInstanceDto>>> createCallable(
@@ -181,6 +217,7 @@ protected SecurityContextAwareCallable<CallableResult<List<ProcessInstanceDto>>>
 
                         return new SecurityContextAwareCallable<CallableResult<List<ProcessInstanceDto>>>(
                                 getSecurityEnforcer(), auth) {
+                        	private static final long serialVersionUID = 1L;
 
                             @Override
                             public CallableResult<List<ProcessInstanceDto>> callWithContextPrepared() throws Exception {
@@ -198,13 +235,17 @@ protected Component getMainComponent(String markupId) {
                 };
 
         myRequestsPanel.add(new VisibleEnableBehaviour() {
+        	private static final long serialVersionUID = 1L;
+        	
             @Override
             public boolean isVisible() {
                 return getWorkflowManager().isEnabled();
             }
         });
         add(myRequestsPanel);
-
+        
+        initMyAccounts();
+        initAssignments();
     }
 
     private CallableResult<List<WorkItemDto>> loadWorkItems() {
@@ -299,5 +340,215 @@ private List<RichHyperlinkType> loadLinksList() {
             return ((PageBase)getPage()).loadAdminGuiConfiguration().getUserDashboardLink();
         }
     }
+    
+    private void initMyAccounts() {
+        AsyncDashboardPanel<Object, List<SimpleAccountDto>> accounts =
+                new AsyncDashboardPanel<Object, List<SimpleAccountDto>>(ID_ACCOUNTS, createStringResource("PageDashboard.accounts"),
+                        GuiStyleConstants.CLASS_SHADOW_ICON_ACCOUNT, GuiStyleConstants.CLASS_OBJECT_SHADOW_BOX_CSS_CLASSES) {
+					private static final long serialVersionUID = 1L;
+
+					@Override
+                    protected SecurityContextAwareCallable<CallableResult<List<SimpleAccountDto>>> createCallable(
+                            Authentication auth, IModel<Object> callableParameterModel) {
+
+                        return new SecurityContextAwareCallable<CallableResult<List<SimpleAccountDto>>>(
+                                getSecurityEnforcer(), auth) {
+
+                            @Override
+                            public AccountCallableResult<List<SimpleAccountDto>> callWithContextPrepared()
+                                    throws Exception {
+                                return loadAccounts();
+                            }
+                        };
+                    }
+
+                    @Override
+                    protected Component getMainComponent(String markupId) {
+                        return new MyAccountsPanel(markupId,
+                                new PropertyModel<List<SimpleAccountDto>>(getModel(), CallableResult.F_VALUE));
+                    }
+
+                    @Override
+                    protected void onPostSuccess(AjaxRequestTarget target) {
+                        showFetchResult();
+                        super.onPostSuccess(target);
+                    }
+
+                    @Override
+                    protected void onUpdateError(AjaxRequestTarget target, Exception ex) {
+                        showFetchResult();
+                        super.onUpdateError(target, ex);
+                    }
+
+                    private void showFetchResult() {
+                        AccountCallableResult<List<SimpleAccountDto>> result =
+                                (AccountCallableResult<List<SimpleAccountDto>>) getModel().getObject();
+
+                        PageBase page = (PageBase) getPage();
+                        for (OperationResult res : result.getFetchResults()) {
+                            if (!WebComponentUtil.isSuccessOrHandledError(res)) {
+                                page.showResult(res);
+                            }
+                        }
+                    }
+                };
+        add(accounts);
+    }
+    
+    private AccountCallableResult<List<SimpleAccountDto>> loadAccounts() throws Exception {
+        LOGGER.debug("Loading accounts.");
+
+        AccountCallableResult callableResult = new AccountCallableResult();
+        List<SimpleAccountDto> list = new ArrayList<SimpleAccountDto>();
+        callableResult.setValue(list);
+        PrismObject<UserType> user = principalModel.getObject();
+        if (user == null) {
+            return callableResult;
+        }
+
+        Task task = createSimpleTask(OPERATION_LOAD_ACCOUNTS);
+        OperationResult result = task.getResult();
+        callableResult.setResult(result);
+        GetOperationOptions getOpts = GetOperationOptions.createResolve();
+        getOpts.setNoFetch(Boolean.TRUE);
+        Collection<SelectorOptions<GetOperationOptions>> options =
+                SelectorOptions.createCollection(ShadowType.F_RESOURCE, getOpts);
+
+        
+        List<ObjectReferenceType> references = user.asObjectable().getLinkRef();
+        for (ObjectReferenceType reference : references) {
+            PrismObject<ShadowType> account = WebModelServiceUtils.loadObject(ShadowType.class, reference.getOid(),
+                    options, this, task, result);
+            if (account == null) {
+                continue;
+            }
+
+            ShadowType accountType = account.asObjectable();
+
+            OperationResultType fetchResult = accountType.getFetchResult();
+
+            if (fetchResult != null) {
+                callableResult.getFetchResults().add(OperationResult.createOperationResult(fetchResult));
+            }
+
+            ResourceType resource = accountType.getResource();
+            String resourceName = WebComponentUtil.getName(resource);
+            list.add(new SimpleAccountDto(WebComponentUtil.getOrigStringFromPoly(accountType.getName()), resourceName));
+        }
+        result.recordSuccessIfUnknown();
+        result.recomputeStatus();
+
+        LOGGER.debug("Finished accounts loading.");
+
+        return callableResult;
+    }
+
+    private void initAssignments() {
+        AsyncDashboardPanel<Object, List<AssignmentItemDto>> assignedOrgUnits =
+                new AsyncDashboardPanel<Object, List<AssignmentItemDto>>(ID_ASSIGNMENTS, createStringResource("PageDashboard.assignments"),
+                        GuiStyleConstants.CLASS_ICON_ASSIGNMENTS, GuiStyleConstants.CLASS_OBJECT_ROLE_BOX_CSS_CLASSES) {
+        			private static final long serialVersionUID = 1L;
+
+                    @Override
+                    protected SecurityContextAwareCallable<CallableResult<List<AssignmentItemDto>>> createCallable(
+                            Authentication auth, IModel callableParameterModel) {
+
+                        return new SecurityContextAwareCallable<CallableResult<List<AssignmentItemDto>>>(
+                                getSecurityEnforcer(), auth) {
+
+                            @Override
+                            public CallableResult<List<AssignmentItemDto>> callWithContextPrepared() throws Exception {
+                                return loadAssignments();
+                            }
+                        };
+                    }
+
+                    @Override
+                    protected Component getMainComponent(String markupId) {
+                        return new MyAssignmentsPanel(markupId,
+                                new PropertyModel<List<AssignmentItemDto>>(getModel(), CallableResult.F_VALUE));
+                    }
+                };
+        add(assignedOrgUnits);
+
+    }
+
+    private CallableResult<List<AssignmentItemDto>> loadAssignments() throws Exception {
+        LOGGER.debug("Loading assignments.");
+        CallableResult callableResult = new CallableResult();
+        List<AssignmentItemDto> list = new ArrayList<AssignmentItemDto>();
+        callableResult.setValue(list);
+
+        PrismObject<UserType> user = principalModel.getObject();
+        if (user == null || user.findContainer(UserType.F_ASSIGNMENT) == null) {
+            return callableResult;
+        }
+
+        Task task = createSimpleTask(OPERATION_LOAD_ASSIGNMENTS);
+        OperationResult result = task.getResult();
+        callableResult.setResult(result);
+
+        PrismContainer assignments = user.findContainer(UserType.F_ASSIGNMENT);
+        List<PrismContainerValue> values = assignments.getValues();
+        for (PrismContainerValue assignment : values) {
+            AssignmentItemDto item = createAssignmentItem(user, assignment, task, result);
+            if (item != null) {
+                list.add(item);
+            }
+        }
+        result.recordSuccessIfUnknown();
+        result.recomputeStatus();
+
+        Collections.sort(list);
+
+        LOGGER.debug("Finished assignments loading.");
+
+        return callableResult;
+    }
+
+	private AssignmentItemDto createAssignmentItem(PrismObject<UserType> user, PrismContainerValue assignment,
+			Task task, OperationResult result) {
+		PrismReference targetRef = assignment.findReference(AssignmentType.F_TARGET_REF);
+		if (targetRef == null || targetRef.isEmpty()) {
+			// account construction
+			PrismContainer construction = assignment.findContainer(AssignmentType.F_CONSTRUCTION);
+			String name = null;
+			if (construction.getValue().asContainerable() != null && !construction.isEmpty()) {
+				ConstructionType constr = (ConstructionType) construction.getValue().asContainerable();
+
+				if (constr.getResourceRef() != null) {
+					ObjectReferenceType resourceRef = constr.getResourceRef();
+
+					PrismObject resource = WebModelServiceUtils.loadObject(ResourceType.class,
+							resourceRef.getOid(), this, task, result);
+					name = WebComponentUtil.getName(resource);
+				}
+			}
+
+			return new AssignmentItemDto(AssignmentEditorDtoType.CONSTRUCTION, name, null, null);
+		}
+
+		PrismReferenceValue refValue = targetRef.getValue();
+		PrismObject value = refValue.getObject();
+		if (value == null) {
+			// resolve reference
+			value = WebModelServiceUtils.loadObject(ObjectType.class, refValue.getOid(), this, task, result);
+		}
+
+		if (value == null) {
+			// we couldn't resolve assignment details
+			return new AssignmentItemDto(null, null, null, null);
+		}
+
+		String name = WebComponentUtil.getDisplayNameOrName(value);
+		AssignmentEditorDtoType type = AssignmentEditorDtoType.getType(value.getCompileTimeClass());
+		String relation = refValue.getRelation() != null ? refValue.getRelation().getLocalPart() : null;
+		String description = null;
+		if (OrgType.class.isAssignableFrom(value.getCompileTimeClass())) {
+			description = (String) value.getPropertyRealValue(OrgType.F_IDENTIFIER, String.class);
+		}
+
+		return new AssignmentItemDto(type, name, description, relation);
+	}
 
 }
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
index ebae7acfd00..2689a4c9fe2 100644
--- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties
+++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -614,7 +614,6 @@ MultiValueField.nameNotSpecified=(Name not specified)
 MyAccountsPanel.account.name=Name
 MyAccountsPanel.account.resource=Resource
 MyAssignmentsPanel.assignment.displayName=Name
-MyAssignmentsPanel.assignment.type=Type
 MyAssignmentsPanel.type.accountConstruction=Account construction
 MyAssignmentsPanel.type.error=Error
 MyAssignmentsPanel.type.orgUnit=Org. unit
diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
index b605196767c..3a4ac9dadb5 100644
--- a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
+++ b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -658,21 +658,18 @@ th.cog, td.cog {
 }
 
 // assignments dashboard panel
-div.dashAssignmentHeader {
+.dash-assignment-header {
 
-	span.targetName {
+	.target-name {
 		font-weight: bold;
-		font-size: 16px;
-		color: #267994;
-		text-shadow: #333333;
-		margin-right: 10px;
+		margin-right: 5px;
 	}
 
-	span.targetDisplayName {
+	.target-display-name {
 
 	}
 
-	span.targetRelation {
+	.target-relation {
 		margin-left: 10px;
 	}
 }