Improvements
Modify default configure
Layout changed