Began working on 4.0

Began working on 4.0
Fixed display issues

Fixed display issues.