diff --git a/app/Resources/translations/messages.de.xliff b/app/Resources/translations/messages.de.xliff
index de271a82..9f948e00 100644
--- a/app/Resources/translations/messages.de.xliff
+++ b/app/Resources/translations/messages.de.xliff
@@ -9,6 +9,14 @@
         <source>browser.title</source>
         <target>Kimai - Time Tracking</target>
       </trans-unit>
+      <trans-unit id="yes">
+        <source>yes</source>
+        <target>Ja</target>
+      </trans-unit>
+      <trans-unit id="no">
+        <source>no</source>
+        <target>Nein</target>
+      </trans-unit>
 
       <!--
         Login / Security
@@ -221,6 +229,10 @@
         <source>action.save</source>
         <target>Speichern</target>
       </trans-unit>
+      <trans-unit id="action.back">
+        <source>action.back</source>
+        <target>Zurück</target>
+      </trans-unit>
       <trans-unit id="action.updated_successfully">
         <source>action.updated_successfully</source>
         <target>Änderungen erfolgreich gespeichert</target>
diff --git a/app/Resources/views/admin/user/edit.html.twig b/app/Resources/views/admin/user/edit.html.twig
index 526e2a6d..1b611f4b 100644
--- a/app/Resources/views/admin/user/edit.html.twig
+++ b/app/Resources/views/admin/user/edit.html.twig
@@ -5,9 +5,5 @@
 
 {% block main %}
     {{ include('default/_flash_messages.html.twig') }}
-
-    {{ include('admin/user/_form.html.twig', {
-        user: user,
-        form: form,
-    }, with_context = false) }}
+    {{ include('default/_form.html.twig', {'title': user.username, 'form': form}) }}
 {% endblock %}
diff --git a/app/Resources/views/admin/user/_form.html.twig b/app/Resources/views/default/_form.html.twig
similarity index 64%
rename from app/Resources/views/admin/user/_form.html.twig
rename to app/Resources/views/default/_form.html.twig
index 147fd73d..f75dfca1 100644
--- a/app/Resources/views/admin/user/_form.html.twig
+++ b/app/Resources/views/default/_form.html.twig
@@ -1,6 +1,6 @@
 <div class="box box-primary">
     <div class="box-header with-border">
-        <h3 class="box-title">{{ user.username }}</h3>
+        <h3 class="box-title">{{ title }}</h3>
     </div>
     {{ form_start(form) }}
     <div class="box-body">
@@ -8,6 +8,9 @@
     </div>
     <div class="box-footer">
         <input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
+        {% if back %}
+            <a href="{{ back }}" class="btn btn-warning">{{ 'action.back'|trans }}</a>
+        {% endif %}
     </div>
     {{ form_end(form) }}
 </div>
\ No newline at end of file
diff --git a/src/AppBundle/Controller/ProfileController.php b/src/AppBundle/Controller/ProfileController.php
index 6cbcdfe1..068c2cfe 100644
--- a/src/AppBundle/Controller/ProfileController.php
+++ b/src/AppBundle/Controller/ProfileController.php
@@ -79,6 +79,19 @@ class ProfileController extends Controller
         );
     }
 
+    protected function getRoles()
+    {
+        $roles = array();
+        foreach ($this->getParameter('security.role_hierarchy.roles') as $key => $value) {
+            $roles[] = $key;
+            foreach ($value as $value2) {
+                $roles[] = $value2;
+            }
+        }
+        $roles = array_unique($roles);
+        return $roles;
+    }
+
     /**
      * @Route("/{username}/edit", name="user_profile_edit")
      * @Method({"GET", "POST"})
diff --git a/src/AppBundle/Form/Type/LanguageType.php b/src/AppBundle/Form/Type/LanguageType.php
new file mode 100644
index 00000000..54bb176b
--- /dev/null
+++ b/src/AppBundle/Form/Type/LanguageType.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AppBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Intl\Intl;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Custom form field type to select the language.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class LanguageType extends AbstractType
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'choices' => array(
+                Intl::getLocaleBundle()->getLocaleName('de', 'de') => 'de'
+            )
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
+}
diff --git a/src/AppBundle/Form/Type/YesNoType.php b/src/AppBundle/Form/Type/YesNoType.php
new file mode 100644
index 00000000..da0b331d
--- /dev/null
+++ b/src/AppBundle/Form/Type/YesNoType.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AppBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Custom form field type to select between Yes and No.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class YesNoType extends AbstractType
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'choices' => ['yes' => true, 'no' => false],
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
+}
diff --git a/src/AppBundle/Form/UserEditType.php b/src/AppBundle/Form/UserEditType.php
index 98033b8f..d5db9853 100644
--- a/src/AppBundle/Form/UserEditType.php
+++ b/src/AppBundle/Form/UserEditType.php
@@ -12,8 +12,9 @@
 namespace AppBundle\Form;
 
 use AppBundle\Entity\User;
+use AppBundle\Form\Type\LanguageType;
+use AppBundle\Form\Type\YesNoType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\LanguageType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -47,8 +48,13 @@ class UserEditType extends AbstractType
             // string - length 5
             ->add('language', LanguageType::class, [
                 'label' => 'label.language',
-                'choices' => array('Deutsch' => 'de') // FIXME translation
             ])
+            // boolean
+            ->add('active', YesNoType::class, [
+                'label' => 'label.active',
+            ])
+            // TODO avatar
+            // TODO roles - see ProfileController::getRoles()
         ;
     }
 
diff --git a/src/AppBundle/Twig/Extensions.php b/src/AppBundle/Twig/Extensions.php
index a27805ca..47714b29 100644
--- a/src/AppBundle/Twig/Extensions.php
+++ b/src/AppBundle/Twig/Extensions.php
@@ -88,7 +88,7 @@ class Extensions extends \Twig_Extension
         $second = $seconds % 60;
         $second = $second > 9 ? $second : '0' . $second;
 
-        return $hour . ':' . $minute  . ':' . $second;
+        return $hour . ':' . $minute  . ':' . $second . 'h';
     }
 
     /**
diff --git a/src/TimesheetBundle/Controller/Admin/ActivityController.php b/src/TimesheetBundle/Controller/Admin/ActivityController.php
index 92770ea8..a93f50d9 100644
--- a/src/TimesheetBundle/Controller/Admin/ActivityController.php
+++ b/src/TimesheetBundle/Controller/Admin/ActivityController.php
@@ -11,13 +11,16 @@
 
 namespace TimesheetBundle\Controller\Admin;
 
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use TimesheetBundle\Entity\Activity;
-use TimesheetBundle\Entity\Timesheet;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
+use TimesheetBundle\Form\ActivityEditForm;
+use TimesheetBundle\Repository\ActivityRepository;
 
 /**
  * Controller used to manage activities in the admin part of the site.
@@ -42,4 +45,67 @@ class ActivityController extends Controller
 
         return $this->render('TimesheetBundle:admin:activity.html.twig', ['entries' => $entries]);
     }
+
+    /**
+     * @Route("/{id}/edit", name="admin_activity_edit")
+     * @Method({"GET", "POST"})
+     */
+    public function editAction($id, Request $request)
+    {
+        $activity = $this->getById($id);
+        $editForm = $this->createEditForm($activity);
+
+        $editForm->handleRequest($request);
+
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
+            $entityManager = $this->getDoctrine()->getManager();
+            $entityManager->persist($activity);
+            $entityManager->flush();
+
+            $this->addFlash('success', 'action.updated_successfully');
+
+            return $this->redirectToRoute(
+                'admin_activity', ['id' => $activity->getId()]
+            );
+        }
+
+        return $this->render(
+            'TimesheetBundle:admin:activity_edit.html.twig',
+            [
+                'activity' => $activity,
+                'form' => $editForm->createView()
+            ]
+        );
+    }
+
+    /**
+     * @param $id
+     * @return null|Activity
+     */
+    protected function getById($id)
+    {
+        /* @var $repo ActivityRepository */
+        $repo = $this->getDoctrine()->getRepository(Activity::class);
+        $activity = $repo->getById($id);
+        if (null === $activity) {
+            throw new NotFoundHttpException('Activity "'.$id.'" does not exist');
+        }
+        return $activity;
+    }
+
+    /**
+     * @param Activity $activity
+     * @return \Symfony\Component\Form\Form
+     */
+    private function createEditForm(Activity $activity)
+    {
+        return $this->createForm(
+            ActivityEditForm::class,
+            $activity,
+            [
+                'action' => $this->generateUrl('admin_activity_edit', ['id' => $activity->getId()]),
+                'method' => 'POST'
+            ]
+        );
+    }
 }
diff --git a/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php b/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php
index 2692ab96..238ece33 100644
--- a/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php
+++ b/src/TimesheetBundle/DataFixtures/ORM/LoadFixtures.php
@@ -13,12 +13,10 @@ namespace TimesheetBundle\DataFixtures\ORM;
 
 use AppBundle\Entity\User;
 use TimesheetBundle\Entity\Activity;
+use TimesheetBundle\Entity\Customer;
 use TimesheetBundle\Entity\Project;
 use TimesheetBundle\Entity\Timesheet;
-use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use AppBundle\DataFixtures\ORM\LoadFixtures as AppBundleLoadFixtures;
 
 /**
@@ -43,6 +41,7 @@ class LoadFixtures extends AppBundleLoadFixtures
      */
     public function load(ObjectManager $manager)
     {
+        $this->loadCustomers($manager);
         $this->loadProjects($manager);
         $this->loadActivities($manager);
         $this->loadTimesheet($manager);
@@ -63,6 +62,21 @@ class LoadFixtures extends AppBundleLoadFixtures
         return $all;
     }
 
+    /**
+     * @param ObjectManager $manager
+     * @return Customer[]
+     */
+    protected function getAllCustomers(ObjectManager $manager)
+    {
+        $all = [];
+        /* @var Customer[] $entries */
+        $entries = $manager->getRepository(Customer::class)->findAll();
+        foreach ($entries as $temp) {
+            $all[$temp->getId()] = $temp;
+        }
+        return $all;
+    }
+
     /**
      * @param ObjectManager $manager
      * @return Project[]
@@ -131,15 +145,37 @@ class LoadFixtures extends AppBundleLoadFixtures
         $manager->flush();
     }
 
+    private function loadCustomers(ObjectManager $manager)
+    {
+        $allTimezones = \DateTimeZone::listIdentifiers();
+        $amountTimezone = count($allTimezones);
+
+        for ($i = 0; $i <= self::AMOUNT_CUSTOMER; $i++) {
+
+            $entry = new Customer();
+            $entry->setName($this->getRandomCustomer());
+            $entry->setCity($this->getRandomLocation());
+            $entry->setComment($this->getRandomPhrase());
+            $entry->setVisible($i % 3 != 0);
+            $entry->setTimezone($allTimezones[rand(1, $amountTimezone)]);
+
+            $manager->persist($entry);
+        }
+        $manager->flush();
+    }
+
     private function loadProjects(ObjectManager $manager)
     {
+        $allCustomer = $this->getAllCustomers($manager);
+        $amountCustomer = count($allCustomer);
+
         for ($i = 0; $i <= self::AMOUNT_PROJECTS; $i++) {
 
             $entry = new Project();
             $entry->setName($this->getRandomProject());
             $entry->setBudget(rand(1000, 100000));
             $entry->setComment($this->getRandomPhrase());
-            $entry->setCustomerId(rand(1, self::AMOUNT_CUSTOMER));          // TODO should be a user object
+            $entry->setCustomer($allCustomer[rand(1, $amountCustomer)]);
             $entry->setVisible($i % 3 != 0);
 
             $manager->persist($entry);
@@ -227,4 +263,26 @@ class LoadFixtures extends AppBundleLoadFixtures
         $all = $this->getLocations();
         return $all[array_rand($all)];
     }
+
+    private function getCustomers()
+    {
+        return [
+            'Acme University',
+            'Snake Oil',
+            'Apple',
+            'Microsoft',
+            'Google',
+            'Oracle',
+            'Yahoo',
+            'Twitter',
+            'Zend',
+            'SensioLabs',
+        ];
+    }
+
+    private function getRandomCustomer()
+    {
+        $all = $this->getCustomers();
+        return $all[array_rand($all)];
+    }
 }
diff --git a/src/TimesheetBundle/Entity/Customer.php b/src/TimesheetBundle/Entity/Customer.php
index ec296ee1..a8716424 100644
--- a/src/TimesheetBundle/Entity/Customer.php
+++ b/src/TimesheetBundle/Entity/Customer.php
@@ -47,6 +47,13 @@ class Customer
      */
     private $comment;
 
+    /**
+     * @var Project[]
+     *
+     * @ORM\OneToMany(targetEntity="TimesheetBundle\Entity\Project", mappedBy="customer")
+     */
+    private $projects;
+
     /**
      * @var boolean
      *
diff --git a/src/TimesheetBundle/Entity/Project.php b/src/TimesheetBundle/Entity/Project.php
index 8d7d2e7e..b250eb3c 100644
--- a/src/TimesheetBundle/Entity/Project.php
+++ b/src/TimesheetBundle/Entity/Project.php
@@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Project
  *
- * @ORM\Table(name="projects", indexes={@ORM\Index(name="customerID", columns={"customerID"})})
+ * @ORM\Table(name="projects")
  * @ORM\Entity(repositoryClass="TimesheetBundle\Repository\ProjectRepository")
  *
  * @author Kevin Papst <kevin@kevinpapst.de>
@@ -34,12 +34,11 @@ class Project
     private $id;
 
     /**
-     * FIXME manytoone
-     * @var integer
+     * @var Customer
      *
-     * @ORM\Column(name="customerID", type="integer", nullable=false)
+     * @ORM\ManyToOne(targetEntity="TimesheetBundle\Entity\Customer", inversedBy="projects")
      */
-    private $customerid;
+    private $customer;
 
     /**
      * @var string
@@ -87,27 +86,21 @@ class Project
     }
 
     /**
-     * Set customerid
-     *
-     * @param integer $customerid
-     *
-     * @return Project
+     * @return Customer
      */
-    public function setCustomerId($customerid)
+    public function getCustomer()
     {
-        $this->customerid = $customerid;
-
-        return $this;
+        return $this->customer;
     }
 
     /**
-     * Get customerid
-     *
-     * @return integer
+     * @param $customer
+     * @return $this
      */
-    public function getCustomerId()
+    public function setCustomer($customer)
     {
-        return $this->customerid;
+        $this->customer = $customer;
+        return $this;
     }
 
     /**
diff --git a/src/TimesheetBundle/Form/ActivityEditForm.php b/src/TimesheetBundle/Form/ActivityEditForm.php
new file mode 100644
index 00000000..6831eca7
--- /dev/null
+++ b/src/TimesheetBundle/Form/ActivityEditForm.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TimesheetBundle\Form;
+
+use AppBundle\Form\Type\YesNoType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use TimesheetBundle\Entity\Activity;
+use TimesheetBundle\Form\Type\ProjectType;
+
+/**
+ * Defines the form used to manipulate Activities.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class ActivityEditForm extends AbstractType
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            // string - length 255
+            ->add('name', null, [
+                'label' => 'label.name',
+            ])
+            // text
+            ->add('comment', TextareaType::class, [
+                'label' => 'label.comment',
+            ])
+            // boolean
+            ->add('visible', YesNoType::class, [
+                'label' => 'label.visible',
+            ])
+            ->add('project', ProjectType::class, [
+                'label' => 'label.project',
+            ])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Activity::class,
+            'csrf_protection' => true,
+            'csrf_field_name' => '_token',
+            'csrf_token_id' => 'admin_activity_edit',
+        ]);
+    }
+}
diff --git a/src/TimesheetBundle/Form/Type/ProjectType.php b/src/TimesheetBundle/Form/Type/ProjectType.php
new file mode 100644
index 00000000..6f041205
--- /dev/null
+++ b/src/TimesheetBundle/Form/Type/ProjectType.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Kimai package.
+ *
+ * (c) Kevin Papst <kevin@kevinpapst.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace TimesheetBundle\Form\Type;
+
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Custom form field type to select a project.
+ *
+ * @author Kevin Papst <kevin@kevinpapst.de>
+ */
+class ProjectType extends AbstractType
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'class' => 'TimesheetBundle:Project',
+            'choice_label' => function ($project) {
+                /* @var $project Project */
+                return
+                    //'[' . $project->getId() . '] ' .
+                    $project->getName() .
+                    ' (' .
+                    $project->getCustomer()->getName() .
+                    ')';
+            },
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParent()
+    {
+        return EntityType::class;
+    }
+}
diff --git a/src/TimesheetBundle/Repository/ActivityRepository.php b/src/TimesheetBundle/Repository/ActivityRepository.php
index d23faf3d..0bbc2d74 100644
--- a/src/TimesheetBundle/Repository/ActivityRepository.php
+++ b/src/TimesheetBundle/Repository/ActivityRepository.php
@@ -12,6 +12,7 @@
 namespace TimesheetBundle\Repository;
 
 use AppBundle\Entity\User;
+use TimesheetBundle\Entity\Activity;
 use TimesheetBundle\Entity\Timesheet;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
@@ -27,6 +28,15 @@ use TimesheetBundle\Model\ActivityStatistic;
 class ActivityRepository extends EntityRepository
 {
 
+    /**
+     * @param $id
+     * @return null|Activity
+     */
+    public function getById($id)
+    {
+        return $this->find($id);
+    }
+    
     /**
      * Return statistic data for all user.
      *
diff --git a/src/TimesheetBundle/Resources/views/admin/activity.html.twig b/src/TimesheetBundle/Resources/views/admin/activity.html.twig
index 1e4db236..f30eb325 100644
--- a/src/TimesheetBundle/Resources/views/admin/activity.html.twig
+++ b/src/TimesheetBundle/Resources/views/admin/activity.html.twig
@@ -6,6 +6,8 @@
 {% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }}{% endblock %}
 
 {% block main %}
+    {{ include('default/_flash_messages.html.twig') }}
+
     {% if entries.count > 0 %}
         {{ tables.data_table_header({
             'label.id': '',
@@ -24,7 +26,10 @@
                 <td>{{ entry.comment }}</td>
                 <td>{{ widgets.label_visible(entry.visible) }}</td>
                 <td>
-                    {{ widgets.button_group({'edit': '#', 'trash': '#'}) }}
+                    {{ widgets.button_group({
+                        'edit': path('admin_activity_edit', {'id': entry.id}),
+                        'trash': '#'}
+                    ) }}
                 </td>
             </tr>
         {% endfor %}
diff --git a/src/TimesheetBundle/Resources/views/admin/activity_edit.html.twig b/src/TimesheetBundle/Resources/views/admin/activity_edit.html.twig
new file mode 100644
index 00000000..d901a9b3
--- /dev/null
+++ b/src/TimesheetBundle/Resources/views/admin/activity_edit.html.twig
@@ -0,0 +1,15 @@
+{% extends 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+{% import "macros/datatables.html.twig" as tables %}
+
+{% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
+{% block page_subtitle %}{{ 'admin_activity.subtitle'|trans }}{% endblock %}
+
+{% block main %}
+    {{ include('default/_flash_messages.html.twig') }}
+    {{ include('default/_form.html.twig', {
+        'title': activity.name,
+        'form': form,
+        'back': path('admin_activity')
+    }) }}
+{% endblock %}