Some small changes, added flag icon