Added flag, design changes, renamed labels