Fixed minor issues with margins