diff --git a/app/views/devise/registrations/edit.html.slim b/app/views/devise/registrations/edit.html.slim
index 53d5b36..ab3bae9 100644
--- a/app/views/devise/registrations/edit.html.slim
+++ b/app/views/devise/registrations/edit.html.slim
@@ -4,7 +4,7 @@
     = f.error_notification
     = f.simple_fields_for :speaker_profile do |ff|
       = ff.input :picture, as: :file
-      = ff.input :first_name
+      = ff.input :first_name, autofocus: true
       = ff.input :last_name
       = ff.input :public_email
       = ff.input :organisation
@@ -15,7 +15,7 @@
 
   .form-inputs
     h3.entry-title Данни за вход в системата
-    = f.input :email, required: true, autofocus: true
+    = f.input :email, required: true
 
     - if devise_mapping.confirmable? && resource.pending_reconfirmation?
       p
diff --git a/app/views/lectures/_lecture.html.slim b/app/views/lectures/_lecture.html.slim
new file mode 100644
index 0000000..9e580ad
--- /dev/null
+++ b/app/views/lectures/_lecture.html.slim
@@ -0,0 +1 @@
+li = link_to lecture.title, lecture
diff --git a/app/views/lectures/index.html.slim b/app/views/lectures/index.html.slim
index 3324930..f946ee3 100644
--- a/app/views/lectures/index.html.slim
+++ b/app/views/lectures/index.html.slim
@@ -1,7 +1,9 @@
 h1.entry-title Моите предложения за лекции
 
-ul
-  - for lecture in @lectures
-    li = link_to lecture.title, lecture
+- unless @lectures.empty?
+  ul
+    = render @lectures
+- else
+  p Все още не Сте предложили лекция
 
-= link_to 'Предложи лекция', new_lecture_path
+= link_to 'Предложи лекция', new_lecture_path, class: 'btn-link'
diff --git a/app/views/workshops/_workshop.html.slim b/app/views/workshops/_workshop.html.slim
new file mode 100644
index 0000000..f4fa390
--- /dev/null
+++ b/app/views/workshops/_workshop.html.slim
@@ -0,0 +1 @@
+li = link_to workshop.title, workshop
diff --git a/app/views/workshops/index.html.slim b/app/views/workshops/index.html.slim
index b9ba7be..e4c1dba 100644
--- a/app/views/workshops/index.html.slim
+++ b/app/views/workshops/index.html.slim
@@ -1,7 +1,9 @@
 h1.entry-title Моите предложения за уъркшопи
 
-ul
-  - for workshop in @workshops
-    li = link_to workshop.title, workshop
+- unless @workshops.empty?
+  ul
+    = render @workshops
+- else
+  p Все още не Сте предложили уъркшоп
 
-= link_to 'Предложи уъркшоп', new_workshop_path
+= link_to 'Предложи уъркшоп', new_workshop_path, class: 'btn-link'