Fix exit button.
Resolve conflict.
Fix some visual issues.