Put contact type under name and add label in edit mode

Categories not having a label and being in a strange spot

## Current
![capture d ecran de 2014-11-05 18 18 25](https://cloud.githubusercontent.com/assets/1013356/4928358/8b32f7b6-6543-11e4-92e0-aa942198393a.png)
![capture d ecran de 2014-11-05 18 18 16](https://cloud.githubusercontent.com/assets/1013356/4928360/8ec1e0ae-6543-11e4-8583-289cb9812686.png)

## Fixed
![capture d ecran de 2014-11-05 18 25 58](https://cloud.githubusercontent.com/assets/1013356/4928369/96863b46-6543-11e4-93f4-622d64044839.png)
![capture d ecran de 2014-11-05 18 25 48](https://cloud.githubusercontent.com/assets/1013356/4928368/94fef7d6-6543-11e4-9979-0d6be9b20a55.png)