fixed alert colors
fixed flash and some other minor design changes
fixed Conflicts