Fixing floating buttons

Addresses #1144