Updated FR layout
Minor fixes and adjustments in rendering code