add ATS for #2, layout improvement for #1