FLOE-180: Fixes and styling tweaks in response to feedback.