moved admin controls to show (not edit) to fix overwriting fields issues, other small fixes to show/index views
commit after pulling Scott's changes from this morning