Revision on acl module and layout