add flags
design adjustments and refining UI