Updated to combine tool detail and add tool view controllers