Small fixes
Added Ukraine template