Float View fixes

Fixes #15
Fixes #3