border & margin adjustment

Signed-off-by: Taylor Swope <tswope212@gmail.com>