AFABC-49 Fixes for layout
Merge pull request #6 from Edzelopez/AFABC-49

AFABC-49 Fixes for layout