Layout EAP Module
Merge branch 'eap-module'