Use country_flag macro
User profile tuning
Some fixes