UI improved, fa locale added