Polishing and refining FARS Architect UI