11 Dec Fixed UI issues.
Resolve Conflict