Fixed aside width on game screen.
Improved UI.
Fix merge.