Fix alignment
Traits can now be edited properly.
Move some groups around.