Padding and Margins Fixes

Signed-off-by: shawnsandy <shawnsandy04@gmail.com>