Rewrite/reorder

Merged add and edit book Activities as they used the same layout and
shared a lot of functionality.