Fix reset
fix inner layouts