Fix acl screen layout

This is a continuation of pull req #435
And another separation, nice!