#104 reorganized and added flag icons