first step to multicurrencies + layout improvements