fixing layout for all form factors