tweaks to fw layout