Floating Windows : Code cleanup and fixing