Layout aligned

Signed-off-by: Alex Volkoff <suxlv2@gmail.com>