Improved layout, improved floating texts