1.  Adjustment of structure
2. fix color theme