design adjustments asked by Fifi