1. Add inline aspect; 2. layout fix