Improved fluent layout and made it a bit more beautiful.