Performance upgrades and minor UI improvements to FM