Updated bi-directional associations
Prettify admin