Fix a fatal bug
Improve layout