tweaked layout and fixed errors for fr user deployment