AFABC-49 Fixes for layout