Update design, delete full screen mode
Resolve conflicts