More small fixes

Correct paths and margin