resolve confilicts
event full view design and users login design