Fix FC rake issue, add pop-ups