Add details form, fix bugs
Merge