Added floating callouts; fix some buttons